From 7c51aba9036db49f0675615a71f4c0a0beba7c59 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Thu, 30 Jun 2022 12:48:47 +0100
Subject: [PATCH] manifest: build packages - move over installer pkgs

The `installerBuildPackageSet() are required by the ISOPipeline,
move it there.
---
 internal/distro/fedora/package_sets.go | 10 ----------
 internal/manifest/iso.go               |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/internal/distro/fedora/package_sets.go b/internal/distro/fedora/package_sets.go
index 67a0898f9..0c1d91063 100644
--- a/internal/distro/fedora/package_sets.go
+++ b/internal/distro/fedora/package_sets.go
@@ -103,15 +103,6 @@ func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
 	return ps
 }
 
-func installerBuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return rpmmd.PackageSet{
-		Include: []string{
-			"isomd5sum",
-			"xorriso",
-		},
-	}
-}
-
 func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
 	ps := rpmmd.PackageSet{
 		Include: []string{
@@ -120,7 +111,6 @@ func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
 		},
 	}
 
-	ps = ps.Append(installerBuildPackageSet(t))
 	ps = ps.Append(anacondaBootPackageSet(t))
 
 	return ps
diff --git a/internal/manifest/iso.go b/internal/manifest/iso.go
index 16ff73fd3..ffb1aaa63 100644
--- a/internal/manifest/iso.go
+++ b/internal/manifest/iso.go
@@ -31,6 +31,13 @@ func NewISOPipeline(m *Manifest,
 	return p
 }
 
+func (p *ISOPipeline) getBuildPackages() []string {
+	return []string{
+		"isomd5sum",
+		"xorriso",
+	}
+}
+
 func (p *ISOPipeline) serialize() osbuild2.Pipeline {
 	pipeline := p.BasePipeline.serialize()