Update osbuild/images to v0.40.0
In addition, simplify the SPEC file to not have to update the minimum required osbuild version gazillion times, but just once. Update the minimum required osbuild version to v109, due to changes in grub2 stages required by the new osbuild/images version. Update osbild SHA in Schutzfile to v109. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
parent
c138ea6939
commit
2f087f1a6c
190 changed files with 57031 additions and 52810 deletions
15
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
15
vendor/github.com/osbuild/images/pkg/manifest/os.go
generated
vendored
|
|
@ -152,6 +152,12 @@ type OS struct {
|
|||
// OSTreeParent source spec (optional). If nil the new commit (if
|
||||
// applicable) will have no parent
|
||||
OSTreeParent *ostree.SourceSpec
|
||||
|
||||
// Enabling Bootupd runs bootupctl generate-update-metadata in the tree to
|
||||
// transform /usr/lib/ostree-boot into a bootupd-compatible update
|
||||
// payload. Only works with ostree-based images.
|
||||
Bootupd bool
|
||||
|
||||
// Partition table, if nil the tree cannot be put on a partitioned disk
|
||||
PartitionTable *disk.PartitionTable
|
||||
|
||||
|
|
@ -605,7 +611,6 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
Kernel: []string{p.kernelVer},
|
||||
AddModules: []string{"fips"},
|
||||
}))
|
||||
p.Files = append(p.Files, osbuild.GenFIPSFiles()...)
|
||||
}
|
||||
|
||||
if !p.KernelOptionsBootloader {
|
||||
|
|
@ -727,6 +732,7 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
}
|
||||
|
||||
if p.FIPS {
|
||||
p.Files = append(p.Files, osbuild.GenFIPSFiles()...)
|
||||
for _, stage := range osbuild.GenFIPSStages() {
|
||||
pipeline.AddStage(stage)
|
||||
}
|
||||
|
|
@ -768,6 +774,13 @@ func (p *OS) serialize() osbuild.Pipeline {
|
|||
"wheel", "docker",
|
||||
},
|
||||
}))
|
||||
if p.Bootupd {
|
||||
pipeline.AddStage(osbuild.NewBootupdGenMetadataStage())
|
||||
}
|
||||
} else {
|
||||
if p.Bootupd {
|
||||
panic("bootupd is only compatible with ostree-based images, this is a programming error")
|
||||
}
|
||||
}
|
||||
|
||||
return pipeline
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue