fedora: add platform packages to RawOSTreeImage build root
Include the platform packages when getting the build packages for the RawOSTreeImage. rpm-ostree is explicitly added for this image type. dracut-config-generic and efibootmgr are temporarily added here, but we should define a platform that includes them instead (some cleanup required in general).
This commit is contained in:
parent
b85fe8109c
commit
901b3a5da9
8 changed files with 1036 additions and 1 deletions
|
|
@ -854,6 +854,15 @@ func newDistro(version int) distro.Distro {
|
|||
iotOCIImgType,
|
||||
iotCommitImgType,
|
||||
iotInstallerImgType,
|
||||
)
|
||||
x86_64.addImageTypes(
|
||||
&platform.X86{
|
||||
BasePlatform: platform.BasePlatform{
|
||||
ImageFormat: platform.FORMAT_RAW,
|
||||
},
|
||||
BIOS: true,
|
||||
UEFIVendor: "fedora",
|
||||
},
|
||||
iotRawImgType,
|
||||
)
|
||||
aarch64.addImageTypes(
|
||||
|
|
@ -903,6 +912,14 @@ func newDistro(version int) distro.Distro {
|
|||
iotCommitImgType,
|
||||
iotOCIImgType,
|
||||
iotInstallerImgType,
|
||||
)
|
||||
aarch64.addImageTypes(
|
||||
&platform.Aarch64{
|
||||
BasePlatform: platform.BasePlatform{
|
||||
ImageFormat: platform.FORMAT_RAW,
|
||||
},
|
||||
UEFIVendor: "fedora",
|
||||
},
|
||||
iotRawImgType,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,17 @@ func NewRawOStreeImage(m *Manifest,
|
|||
}
|
||||
|
||||
func (p *RawOSTreeImage) getBuildPackages() []string {
|
||||
return p.treePipeline.PartitionTable.GetBuildPackages()
|
||||
packages := p.platform.GetBuildPackages()
|
||||
packages = append(packages, p.platform.GetPackages()...)
|
||||
packages = append(packages, p.treePipeline.PartitionTable.GetBuildPackages()...)
|
||||
packages = append(packages,
|
||||
"rpm-ostree",
|
||||
|
||||
// these should be defined on the platform
|
||||
"dracut-config-generic",
|
||||
"efibootmgr",
|
||||
)
|
||||
return packages
|
||||
}
|
||||
|
||||
func (p *RawOSTreeImage) serialize() osbuild.Pipeline {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue