particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deps: update osbuild/images to v0.3.0

Browse source 
Bump the required osbuild version to v93 (due to the systemd units
change).

Pin the new osbuild version in Schutzfile.

Update repo snapshots in Schutzfile due to osbuild v93 depending on
new selinux-policy build.
This commit is contained in:
Achilleas Koutsou 2023-08-17 16:33:11 +02:00 • committed by Tomáš Hozza
parent 715bdba1bf
commit d4332f85d3
62 changed files with 1270 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

27
vendor/github.com/osbuild/images/pkg/manifest/iso.go generated vendored
View file

@ -10,24 +10,29 @@ import (
type ISO struct {
Base
ISOLinux bool
Filename string
filename string
treePipeline Pipeline
isoLabel string
}
func NewISO(m *Manifest,
buildPipeline *Build,
treePipeline Pipeline,
isoLabel string) *ISO {
func (p ISO) Filename() string {
return p.filename
}
func (p *ISO) SetFilename(filename string) {
p.filename = filename
}
func NewISO(buildPipeline *Build, treePipeline Pipeline, isoLabel string) *ISO {
p := &ISO{
Base: NewBase(m, "bootiso", buildPipeline),
Base: NewBase(treePipeline.Manifest(), "bootiso", buildPipeline),
treePipeline: treePipeline,
Filename: "image.iso",
filename: "image.iso",
isoLabel: isoLabel,
}
buildPipeline.addDependent(p)
m.addPipeline(p)
treePipeline.Manifest().addPipeline(p)
return p
}
@ -41,8 +46,8 @@ func (p *ISO) getBuildPackages(Distro) []string {
func (p *ISO) serialize() osbuild.Pipeline {
pipeline := p.Base.serialize()
pipeline.AddStage(osbuild.NewXorrisofsStage(xorrisofsStageOptions(p.Filename, p.isoLabel, p.ISOLinux), p.treePipeline.Name()))
pipeline.AddStage(osbuild.NewImplantisomd5Stage(&osbuild.Implantisomd5StageOptions{Filename: p.Filename}))
pipeline.AddStage(osbuild.NewXorrisofsStage(xorrisofsStageOptions(p.Filename(), p.isoLabel, p.ISOLinux), p.treePipeline.Name()))
pipeline.AddStage(osbuild.NewImplantisomd5Stage(&osbuild.Implantisomd5StageOptions{Filename: p.Filename()}))
return pipeline
}
@ -71,5 +76,5 @@ func xorrisofsStageOptions(filename, isolabel string, isolinux bool) *osbuild.Xo
func (p *ISO) Export() *artifact.Artifact {
p.Base.export = true
mimeType := "application/x-iso9660-image"
return artifact.New(p.Name(), p.Filename, &mimeType)
return artifact.New(p.Name(), p.Filename(), &mimeType)
}