From ca86f0c551112cd17bb2b122beca7071a6361247 Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Fri, 24 Nov 2023 17:39:34 +0530 Subject: [PATCH] app-containers/skopeo: fix failed build when -device-mapper https://github.com/containers/skopeo/pull/2161 Signed-off-by: Rahil Bhimjiani Closes: https://github.com/gentoo/gentoo/pull/33965 Signed-off-by: Sam James --- .../skopeo/{skopeo-1.14.0.ebuild => skopeo-1.14.0-r1.ebuild} | 2 +- app-containers/skopeo/skopeo-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename app-containers/skopeo/{skopeo-1.14.0.ebuild => skopeo-1.14.0-r1.ebuild} (95%) diff --git a/app-containers/skopeo/skopeo-1.14.0.ebuild b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild similarity index 95% rename from app-containers/skopeo/skopeo-1.14.0.ebuild rename to app-containers/skopeo/skopeo-1.14.0-r1.ebuild index 63503fe4b2cf4..9fc4a14669123 100644 --- a/app-containers/skopeo/skopeo-1.14.0.ebuild +++ b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild @@ -62,7 +62,7 @@ src_prepare() { cat <<-EOF > hack/libdm_tag.sh || die #!/usr/bin/env bash - $(usex device-mapper echo "echo libdm_no_deferred_remove") + $(usex device-mapper echo "echo libdm_no_deferred_remove exclude_graphdriver_devicemapper") EOF cat <<-EOF > hack/libsubid_tag.sh || die diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild index 63503fe4b2cf4..9fc4a14669123 100644 --- a/app-containers/skopeo/skopeo-9999.ebuild +++ b/app-containers/skopeo/skopeo-9999.ebuild @@ -62,7 +62,7 @@ src_prepare() { cat <<-EOF > hack/libdm_tag.sh || die #!/usr/bin/env bash - $(usex device-mapper echo "echo libdm_no_deferred_remove") + $(usex device-mapper echo "echo libdm_no_deferred_remove exclude_graphdriver_devicemapper") EOF cat <<-EOF > hack/libsubid_tag.sh || die