commit:     ca86f0c551112cd17bb2b122beca7071a6361247
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> website>
AuthorDate: Fri Nov 24 12:09:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 12:28:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca86f0c5

app-containers/skopeo: fix failed build when -device-mapper

https://github.com/containers/skopeo/pull/2161

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.website>
Closes: https://github.com/gentoo/gentoo/pull/33965
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-containers/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(-)

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 63503fe4b2cf..9fc4a1466912 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 63503fe4b2cf..9fc4a1466912 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

Reply via email to