From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C333158099 for ; Fri, 24 Nov 2023 12:28:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 524052BC024; Fri, 24 Nov 2023 12:28:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 305B22BC024 for ; Fri, 24 Nov 2023 12:28:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F20A33EB78 for ; Fri, 24 Nov 2023 12:28:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5BE813BB for ; Fri, 24 Nov 2023 12:28:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1700828891.ca86f0c551112cd17bb2b122beca7071a6361247.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/skopeo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/skopeo/skopeo-1.14.0-r1.ebuild app-containers/skopeo/skopeo-1.14.0.ebuild app-containers/skopeo/skopeo-9999.ebuild X-VCS-Directories: app-containers/skopeo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ca86f0c551112cd17bb2b122beca7071a6361247 X-VCS-Branch: master Date: Fri, 24 Nov 2023 12:28:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f5c4d701-c8c3-4c2f-854b-4b43b943d70d X-Archives-Hash: 1ccd3d9e8df66bcd89a9ef11b3adf427 commit: ca86f0c551112cd17bb2b122beca7071a6361247 Author: Rahil Bhimjiani rahil website> AuthorDate: Fri Nov 24 12:09:34 2023 +0000 Commit: Sam James gentoo 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 rahil.website> Closes: https://github.com/gentoo/gentoo/pull/33965 Signed-off-by: Sam James 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