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

distro/rhel85: split up intaller build pkgs set

Browse source 
Split the common installer build packages from the one specific to
anaconda and edge.
NB: The "inheritance" is now done in the package sets rather than
outside, via package set merging.
This commit is contained in:
Christian Kellner 2021-08-24 12:18:48 +00:00 • committed by Tom Gundersen
parent 755bde0afb
commit 963df5188e
2 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/distro/rhel85/distro.go
View file

@ -599,7 +599,7 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
// for other architectures, this will need to be moved to the
// architecture and the merging will happen in the PackageSets()
// method like the other sets.
buildPkgsKey: x8664InstallerBuildPackageSet().Append(edgeBuildPackageSet()),
buildPkgsKey: edgeInstallerBuildPackageSet(),
osPkgsKey: edgeCommitPackageSet(),
installerPkgsKey: edgeInstallerPackageSet(),
},
@ -623,7 +623,7 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
// for other architectures, this will need to be moved to the
// architecture and the merging will happen in the PackageSets()
// method like the other sets.
buildPkgsKey: x8664InstallerBuildPackageSet().Append(edgeBuildPackageSet()),
buildPkgsKey: edgeInstallerBuildPackageSet(),
installerPkgsKey: edgeSimplifiedInstallerPackageSet(),
},
enabledServices: edgeServices,
@ -826,7 +826,7 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
filename: "installer.iso",
mimeType: "application/x-iso9660-image",
packageSets: map[string]rpmmd.PackageSet{
buildPkgsKey: x8664InstallerBuildPackageSet(),
buildPkgsKey: anacondaBuildPackageSet(),
osPkgsKey: bareMetalPackageSet(),
installerPkgsKey: installerPackageSet(),
},

39
internal/distro/rhel85/package_sets.go
View file

@ -49,19 +49,44 @@ func edgeBuildPackageSet() rpmmd.PackageSet {
// x86_64 installer ISO build package set
// TODO: separate into common installer and arch specific sets
func x8664InstallerBuildPackageSet() rpmmd.PackageSet {
func installerBuildPackageSet() rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"efibootmgr", "genisoimage", "grub2-efi-ia32-cdboot",
"grub2-efi-x64", "grub2-efi-x64-cdboot", "grub2-pc",
"grub2-pc-modules", "grub2-tools", "grub2-tools-efi",
"grub2-tools-extra", "grub2-tools-minimal", "isomd5sum",
"rpm-ostree", "shim-ia32", "shim-x64", "squashfs-tools",
"syslinux", "syslinux-nonlinux", "xorriso",
"genisoimage",
"isomd5sum",
"xorriso",
},
}
}
func anacondaBuildPackageSet() rpmmd.PackageSet {
return installerBuildPackageSet().Append(rpmmd.PackageSet{
Include: []string{
"efibootmgr",
"grub2-efi-ia32-cdboot",
"grub2-efi-x64",
"grub2-efi-x64-cdboot",
"grub2-pc",
"grub2-pc-modules",
"grub2-tools",
"grub2-tools-efi",
"grub2-tools-extra",
"grub2-tools-minimal",
"shim-ia32",
"shim-x64",
"squashfs-tools",
"syslinux",
"syslinux-nonlinux",
},
})
}
func edgeInstallerBuildPackageSet() rpmmd.PackageSet {
return anacondaBuildPackageSet().Append(
edgeBuildPackageSet(),
)
}
// BOOT PACKAGE SETS
// x86_64 Legacy arch-specific boot package set