manifest: build packages - move over anaconda pkgs

squashfs-tools is used by the mono stage, and lorax by lorax.

For now copy over the anaconda boot package set as-is, we can
refactor further from the pipelines.
This commit is contained in:
Tom Gundersen 2022-06-30 13:13:30 +01:00
parent 7c51aba903
commit 41f6e428af
3 changed files with 47 additions and 14 deletions

View file

@ -103,21 +103,8 @@ func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
return ps
}
func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
ps := rpmmd.PackageSet{
Include: []string{
"squashfs-tools",
"lorax-templates-generic",
},
}
ps = ps.Append(anacondaBootPackageSet(t))
return ps
}
func iotInstallerBuildPackageSet(t *imageType) rpmmd.PackageSet {
return anacondaBuildPackageSet(t)
return rpmmd.PackageSet{}
}
// BOOT PACKAGE SETS

View file

@ -1,6 +1,8 @@
package manifest
import (
"fmt"
"github.com/osbuild/osbuild-composer/internal/osbuild2"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
)
@ -60,6 +62,49 @@ func NewAnacondaPipeline(m *Manifest,
return p
}
// TODO: refactor - what is required to boot and what to build, and
// do they all belong in this pipeline?
func (p *AnacondaPipeline) anacondaBootPackageSet() []string {
packages := []string{
"grub2-tools",
"grub2-tools-extra",
"grub2-tools-minimal",
"efibootmgr",
}
// TODO: use constants for architectures
switch p.arch {
case "x86_64":
packages = append(packages,
"grub2-efi-x64",
"grub2-efi-x64-cdboot",
"grub2-pc",
"grub2-pc-modules",
"shim-x64",
"syslinux",
"syslinux-nonlinux",
)
case "aarch64":
packages = append(packages,
"grub2-efi-aa64-cdboot",
"grub2-efi-aa64",
"shim-aa64",
)
default:
panic(fmt.Sprintf("unsupported arch: %s", p.arch))
}
return packages
}
func (p *AnacondaPipeline) getBuildPackages() []string {
packages := p.anacondaBootPackageSet()
packages = append(packages,
"lorax-templates-generic",
)
return packages
}
func (p *AnacondaPipeline) getPackageSetChain() []rpmmd.PackageSet {
packages := []string{}
return []rpmmd.PackageSet{

View file

@ -66,6 +66,7 @@ func (p *ISOTreePipeline) getOSTreeCommits() []osTreeCommit {
func (p *ISOTreePipeline) getBuildPackages() []string {
packages := []string{
"rpm-ostree",
"squashfs-tools",
}
return packages
}