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

manifest: build packages - move over installer pkgs

Browse source 
The `installerBuildPackageSet() are required by the ISOPipeline,
move it there.
This commit is contained in:
Tom Gundersen 2022-06-30 12:48:47 +01:00
parent 70d7a25a8e
commit 7c51aba903
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,15 +103,6 @@ func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
return ps return ps
} }
func installerBuildPackageSet(t *imageType) rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"isomd5sum",
"xorriso",
},
}
}
func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet { func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
ps := rpmmd.PackageSet{ ps := rpmmd.PackageSet{
Include: []string{ Include: []string{
@ -120,7 +111,6 @@ func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
}, },
} }
ps = ps.Append(installerBuildPackageSet(t))
ps = ps.Append(anacondaBootPackageSet(t)) ps = ps.Append(anacondaBootPackageSet(t))
return ps return ps

7
internal/manifest/iso.go
View file

@ -31,6 +31,13 @@ func NewISOPipeline(m *Manifest,
return p return p
} }
func (p *ISOPipeline) getBuildPackages() []string {
return []string{
"isomd5sum",
"xorriso",
}
}
func (p *ISOPipeline) serialize() osbuild2.Pipeline { func (p *ISOPipeline) serialize() osbuild2.Pipeline {
pipeline := p.BasePipeline.serialize() pipeline := p.BasePipeline.serialize()