From 916031915238e00c2459ef17e561162bdbd984b6 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 7 Jul 2022 00:32:05 +0100 Subject: [PATCH] manifest/build: move out qemu-img Let each pipeline that requires it pull in qemu-img. --- internal/manifest/build.go | 1 - internal/manifest/qcow2.go | 4 ++++ internal/manifest/vmdk.go | 4 ++++ internal/manifest/vpc.go | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/manifest/build.go b/internal/manifest/build.go index 3351a259a..682867489 100644 --- a/internal/manifest/build.go +++ b/internal/manifest/build.go @@ -43,7 +43,6 @@ func (p *BuildPipeline) getPackageSetChain() []rpmmd.PackageSet { "dosfstools", "e2fsprogs", "policycoreutils", - "qemu-img", "selinux-policy-targeted", "systemd", "tar", diff --git a/internal/manifest/qcow2.go b/internal/manifest/qcow2.go index 457c02085..a3903a595 100644 --- a/internal/manifest/qcow2.go +++ b/internal/manifest/qcow2.go @@ -47,3 +47,7 @@ func (p *QCOW2Pipeline) serialize() osbuild2.Pipeline { return pipeline } + +func (p *QCOW2Pipeline) getBuildPackages() []string { + return []string{"qemu-img"} +} diff --git a/internal/manifest/vmdk.go b/internal/manifest/vmdk.go index 2d6c4f543..756e24946 100644 --- a/internal/manifest/vmdk.go +++ b/internal/manifest/vmdk.go @@ -43,3 +43,7 @@ func (p *VMDKPipeline) serialize() osbuild2.Pipeline { return pipeline } + +func (p *VMDKPipeline) getBuildPackages() []string { + return []string{"qemu-img"} +} diff --git a/internal/manifest/vpc.go b/internal/manifest/vpc.go index bbae5ed22..35df0ffd0 100644 --- a/internal/manifest/vpc.go +++ b/internal/manifest/vpc.go @@ -42,3 +42,7 @@ func (p *VPCPipeline) serialize() osbuild2.Pipeline { return pipeline } + +func (p *VPCPipeline) getBuildPackages() []string { + return []string{"qemu-img"} +}