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

manifest/build: replace explicit dnf with implicit rpm

Browse source 
The pipelines don't use dnf, only rpm. Let the ones that need it pull it in.
This commit is contained in:
Tom Gundersen 2022-07-07 20:05:03 +01:00
parent b714dcb780
commit b405ce4d89
4 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/manifest/anaconda.go
View file

@ -102,6 +102,7 @@ func (p *AnacondaPipeline) anacondaBootPackageSet() []string {
func (p *AnacondaPipeline) getBuildPackages() []string { func (p *AnacondaPipeline) getBuildPackages() []string {
packages := p.anacondaBootPackageSet() packages := p.anacondaBootPackageSet()
packages = append(packages, packages = append(packages,
"rpm",
"lorax-templates-generic", "lorax-templates-generic",
) )
return packages return packages

1
internal/manifest/build.go
View file

@ -39,7 +39,6 @@ func (p *BuildPipeline) addDependent(dep Pipeline) {
func (p *BuildPipeline) getPackageSetChain() []rpmmd.PackageSet { func (p *BuildPipeline) getPackageSetChain() []rpmmd.PackageSet {
// TODO: break apart into individual pipelines // TODO: break apart into individual pipelines
packages := []string{ packages := []string{
"dnf",
"selinux-policy-targeted", "selinux-policy-targeted",
"coreutils", "coreutils",
"systemd", "systemd",

1
internal/manifest/commit_server_tree.go
View file

@ -66,6 +66,7 @@ func (p *OSTreeCommitServerTreePipeline) getPackageSetChain() []rpmmd.PackageSet
func (p *OSTreeCommitServerTreePipeline) getBuildPackages() []string { func (p *OSTreeCommitServerTreePipeline) getBuildPackages() []string {
packages := []string{ packages := []string{
"rpm",
"rpm-ostree", "rpm-ostree",
} }
return packages return packages

1
internal/manifest/os.go
View file

@ -167,6 +167,7 @@ func (p *OSPipeline) getPackageSetChain() []rpmmd.PackageSet {
func (p *OSPipeline) getBuildPackages() []string { func (p *OSPipeline) getBuildPackages() []string {
packages := p.platform.GetBuildPackages() packages := p.platform.GetBuildPackages()
packages = append(packages, "rpm")
if p.OSTree != nil { if p.OSTree != nil {
packages = append(packages, "rpm-ostree") packages = append(packages, "rpm-ostree")
} }