From b714dcb780904cddd3fdbf598dd37af168e94e40 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 7 Jul 2022 19:29:08 +0100 Subject: [PATCH] manifest/build: pull in tar implicitly The tar pipeline requires tar, let only that pull it in. --- internal/manifest/build.go | 1 - internal/manifest/oci_container.go | 4 ++++ internal/manifest/tar.go | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/manifest/build.go b/internal/manifest/build.go index 22161a9ed..fc4e2e412 100644 --- a/internal/manifest/build.go +++ b/internal/manifest/build.go @@ -43,7 +43,6 @@ func (p *BuildPipeline) getPackageSetChain() []rpmmd.PackageSet { "selinux-policy-targeted", "coreutils", "systemd", - "tar", "xz", } diff --git a/internal/manifest/oci_container.go b/internal/manifest/oci_container.go index 835f5d9f2..825c4134e 100644 --- a/internal/manifest/oci_container.go +++ b/internal/manifest/oci_container.go @@ -55,3 +55,7 @@ func (p *OCIContainerPipeline) serialize() osbuild2.Pipeline { return pipeline } + +func (p *OCIContainerPipeline) getBuildPackages() []string { + return []string{"tar"} +} diff --git a/internal/manifest/tar.go b/internal/manifest/tar.go index 31f0b2edd..c175ced69 100644 --- a/internal/manifest/tar.go +++ b/internal/manifest/tar.go @@ -45,3 +45,7 @@ func (p *TarPipeline) serialize() osbuild2.Pipeline { return pipeline } + +func (p *TarPipeline) getBuildPackages() []string { + return []string{"tar"} +}