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

manifest/os: move packages needed for early boot into the pipeline definition

Browse source 
This simplifies the package set definitions in the fedora distro, and unifies the handling
of IoT and non-IoT images.
This commit is contained in:
Tom Gundersen 2022-07-05 13:19:01 +01:00
parent 03fc2d5bfd
commit 4e2cea61bb
2 changed files with 33 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

95
internal/distro/fedora/package_sets.go
View file

@ -30,84 +30,6 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
"geolite2-country",
"zram-generator-defaults",
},
}.Append(bootPackageSet(t))
}
// BOOT PACKAGE SETS
func bootPackageSet(t *imageType) rpmmd.PackageSet {
if !t.bootable {
return rpmmd.PackageSet{}
}
var addLegacyBootPkg bool
var addUEFIBootPkg bool
switch bt := t.getBootType(); bt {
case distro.LegacyBootType:
addLegacyBootPkg = true
case distro.UEFIBootType:
addUEFIBootPkg = true
case distro.HybridBootType:
addLegacyBootPkg = true
addUEFIBootPkg = true
default:
panic(fmt.Sprintf("unsupported boot type: %q", bt))
}
ps := rpmmd.PackageSet{}
switch t.Arch().Name() {
case distro.X86_64ArchName:
if addLegacyBootPkg {
ps = ps.Append(x8664LegacyBootPackageSet(t))
}
if addUEFIBootPkg {
ps = ps.Append(x8664UEFIBootPackageSet(t))
}
case distro.Aarch64ArchName:
ps = ps.Append(aarch64UEFIBootPackageSet(t))
default:
panic(fmt.Sprintf("unsupported boot arch: %s", t.Arch().Name()))
}
return ps
}
// x86_64 Legacy arch-specific boot package set
func x8664LegacyBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"grub2-pc",
},
}
}
// x86_64 UEFI arch-specific boot package set
func x8664UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-x64",
"shim-x64",
},
}
}
// aarch64 UEFI arch-specific boot package set
func aarch64UEFIBootPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"dracut-config-generic",
"efibootmgr",
"grub2-efi-aa64",
"grub2-tools",
"shim-aa64",
},
}
}
@ -132,7 +54,7 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
"grubby-deprecated",
"extlinux-bootloader",
},
}.Append(bootPackageSet(t))
}
return ps
}
@ -157,7 +79,7 @@ func vhdCommonPackageSet(t *imageType) rpmmd.PackageSet {
"geolite2-country",
"zram-generator-defaults",
},
}.Append(bootPackageSet(t))
}
return ps
}
@ -183,7 +105,7 @@ func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet {
"grubby-deprecated",
"extlinux-bootloader",
},
}.Append(bootPackageSet(t))
}
return ps
}
@ -207,7 +129,7 @@ func openstackCommonPackageSet(t *imageType) rpmmd.PackageSet {
"geolite2-country",
"zram-generator-defaults",
},
}.Append(bootPackageSet(t))
}
return ps
}
@ -223,7 +145,6 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
"sssd-client",
"libsss_sudo",
"shadow-utils",
"dracut-config-generic",
"dracut-network",
"polkit",
"lvm2",
@ -329,10 +250,6 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
func x8664IOTCommitPackageSet() rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"grub2",
"grub2-efi-x64",
"efibootmgr",
"shim-x64",
"microcode_ctl",
"iwl1000-firmware",
"iwl100-firmware",
@ -352,10 +269,6 @@ func x8664IOTCommitPackageSet() rpmmd.PackageSet {
func aarch64IOTCommitPackageSet() rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"grub2",
"grub2-efi-aa64",
"efibootmgr",
"shim-aa64",
"uboot-images-armv8",
"bcm283x-firmware",
"arm-image-installer"},

29
internal/manifest/os.go
View file

@ -115,6 +115,7 @@ func NewOSPipeline(m *Manifest,
p := &OSPipeline{
BasePipeline: NewBasePipeline(m, "os", buildPipeline, nil),
repos: repos,
arch: arch,
Language: "C.UTF-8",
Hostname: "localhost.localdomain",
Timezone: "UTC",
@ -127,6 +128,34 @@ func NewOSPipeline(m *Manifest,
func (p *OSPipeline) getPackageSetChain() []rpmmd.PackageSet {
packages := []string{}
switch p.arch {
case ARCH_X86_64:
if p.BIOSPlatform != "" {
packages = append(packages,
"dracut-config-generic",
"grub2-pc")
}
if p.UEFIVendor != "" {
packages = append(packages,
"dracut-config-generic",
"efibootmgr",
"grub2-efi-x64",
"shim-x64")
}
case ARCH_AARCH64:
if p.UEFIVendor != "" {
packages = append(packages,
"dracut-config-generic",
"efibootmgr",
"grub2-efi-aa64",
"grub2-tools",
"shim-aa64")
}
default:
panic("unsupported architecture")
}
chain := []rpmmd.PackageSet{
{
Include: append(packages, p.ExtraBasePackages...),