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

manifest: boot packages - move over anaconda pkgs

Browse source 
The same set is used for building and booting, move over the boot
logic to the pipeline as well.
This commit is contained in:
Tom Gundersen 2022-06-30 13:23:07 +01:00
parent 41f6e428af
commit fbad41ac5e
2 changed files with 1 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,59 +50,6 @@ func iotBuildPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{} return rpmmd.PackageSet{}
} }
// installer boot package sets, needed for booting and
// also in the build host
func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
ps := rpmmd.PackageSet{}
grubCommon := rpmmd.PackageSet{
Include: []string{
"grub2-tools",
"grub2-tools-extra",
"grub2-tools-minimal",
},
}
efiCommon := rpmmd.PackageSet{
Include: []string{
"efibootmgr",
},
}
switch t.Arch().Name() {
case distro.X86_64ArchName:
ps = ps.Append(grubCommon)
ps = ps.Append(efiCommon)
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"grub2-efi-x64",
"grub2-efi-x64-cdboot",
"grub2-pc",
"grub2-pc-modules",
"shim-x64",
"syslinux",
"syslinux-nonlinux",
},
})
case distro.Aarch64ArchName:
ps = ps.Append(grubCommon)
ps = ps.Append(efiCommon)
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"grub2-efi-aa64-cdboot",
"grub2-efi-aa64",
"shim-aa64",
},
})
default:
panic(fmt.Sprintf("unsupported arch: %s", t.Arch().Name()))
}
return ps
}
func iotInstallerBuildPackageSet(t *imageType) rpmmd.PackageSet { func iotInstallerBuildPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{} return rpmmd.PackageSet{}
} }
@ -628,8 +575,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
}, },
}) })
ps = ps.Append(anacondaBootPackageSet(t))
r, err := strconv.Atoi(t.Arch().Distro().Releasever()) r, err := strconv.Atoi(t.Arch().Distro().Releasever())
if err != nil { if err != nil {
log.Errorf("failed to convert fedora release %s to string: %s", t.Arch().Distro().Releasever(), err) log.Errorf("failed to convert fedora release %s to string: %s", t.Arch().Distro().Releasever(), err)

2
internal/manifest/anaconda.go
View file

@ -106,7 +106,7 @@ func (p *AnacondaPipeline) getBuildPackages() []string {
} }
func (p *AnacondaPipeline) getPackageSetChain() []rpmmd.PackageSet { func (p *AnacondaPipeline) getPackageSetChain() []rpmmd.PackageSet {
packages := []string{} packages := p.anacondaBootPackageSet()
return []rpmmd.PackageSet{ return []rpmmd.PackageSet{
{ {
Include: append(packages, p.ExtraPackages...), Include: append(packages, p.ExtraPackages...),