| 1 |
commit: f615248b2b83d774324f22d3a4a9aa01af10426f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 26 04:31:17 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 26 04:31:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f615248b |
| 7 |
|
| 8 |
app-emulation/skopeo: add upstream VFS user xattrs patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/skopeo/Manifest | 1 + |
| 14 |
.../skopeo/{skopeo-0.1.40.ebuild => skopeo-0.1.40-r1.ebuild} | 12 +++++++++++- |
| 15 |
2 files changed, 12 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest |
| 18 |
index a2d4b48ca79..01fc9d0acf5 100644 |
| 19 |
--- a/app-emulation/skopeo/Manifest |
| 20 |
+++ b/app-emulation/skopeo/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
+DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d |
| 23 |
DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c |
| 24 |
DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3 |
| 25 |
|
| 26 |
diff --git a/app-emulation/skopeo/skopeo-0.1.40.ebuild b/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild |
| 27 |
similarity index 75% |
| 28 |
rename from app-emulation/skopeo/skopeo-0.1.40.ebuild |
| 29 |
rename to app-emulation/skopeo/skopeo-0.1.40-r1.ebuild |
| 30 |
index 3ee26d3ab1a..c42103170fb 100644 |
| 31 |
--- a/app-emulation/skopeo/skopeo-0.1.40.ebuild |
| 32 |
+++ b/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild |
| 33 |
@@ -7,7 +7,9 @@ inherit go-module bash-completion-r1 |
| 34 |
|
| 35 |
DESCRIPTION="Command line utility foroperations on container images and image repositories" |
| 36 |
HOMEPAGE="https://github.com/containers/skopeo" |
| 37 |
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 38 |
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch" |
| 39 |
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 40 |
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}" |
| 41 |
|
| 42 |
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" |
| 43 |
SLOT="0" |
| 44 |
@@ -25,6 +27,14 @@ RDEPEND="${COMMON_DEPEND}" |
| 45 |
|
| 46 |
RESTRICT="test" |
| 47 |
|
| 48 |
+src_prepare() { |
| 49 |
+ default |
| 50 |
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \ |
| 51 |
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \ |
| 52 |
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die |
| 53 |
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" |
| 54 |
+} |
| 55 |
+ |
| 56 |
src_compile() { |
| 57 |
local BUILDTAGS="containers_image_ostree_stub" |
| 58 |
set -- env -u GOCACHE -u XDG_CACHE_HOME \ |
Archives