manifest: build packages - move over 'rpm-ostree'

Move `iotBuildPackages()` from the distro to the pipelines.

internal/distro/fedora/package_sets.go

@@ -47,11 +47,7 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 
 // common iot image build package set
 func iotBuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return rpmmd.PackageSet{
-		Include: []string{
-			"rpm-ostree",
-		},
-	}
+	return rpmmd.PackageSet{}
 }
 
 // installer boot package sets, needed for booting and
@@ -131,9 +127,7 @@ func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
 }
 
 func iotInstallerBuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return anacondaBuildPackageSet(t).Append(
-		iotBuildPackageSet(t),
-	)
+	return anacondaBuildPackageSet(t)
 }
 
 // BOOT PACKAGE SETS

internal/manifest/commit.go

@@ -33,6 +33,13 @@ func NewOSTreeCommitPipeline(m *Manifest,
 	return p
 }
 
+func (p *OSTreeCommitPipeline) getBuildPackages() []string {
+	packages := []string{
+		"rpm-ostree",
+	}
+	return packages
+}
+
 func (p *OSTreeCommitPipeline) serialize() osbuild2.Pipeline {
 	pipeline := p.BasePipeline.serialize()
 

internal/manifest/commit_server_tree.go

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

internal/manifest/iso_tree.go

@@ -63,6 +63,13 @@ func (p *ISOTreePipeline) getOSTreeCommits() []osTreeCommit {
 	}
 }
 
+func (p *ISOTreePipeline) getBuildPackages() []string {
+	packages := []string{
+		"rpm-ostree",
+	}
+	return packages
+}
+
 func (p *ISOTreePipeline) serialize() osbuild2.Pipeline {
 	pipeline := p.BasePipeline.serialize()
 

internal/manifest/os.go

@@ -161,6 +161,9 @@ func (p *OSPipeline) getBuildPackages() []string {
 	if p.grubLegacy != "" {
 		packages = append(packages, "grub2-pc")
 	}
+	if p.osTree {
+		packages = append(packages, "rpm-ostree")
+	}
 	return packages
 }