| 1 |
commit: 40f1a9aee7d5ef20dfbd669135ba253ee93d4077 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 26 04:12:52 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 26 04:18:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f1a9ae |
| 7 |
|
| 8 |
app-emulation/buildah: 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/buildah/Manifest | 1 + |
| 14 |
.../buildah/{buildah-1.11.5.ebuild => buildah-1.11.5-r1.ebuild} | 8 +++++++- |
| 15 |
2 files changed, 8 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest |
| 18 |
index 4cbdecb560f..f2f644ce304 100644 |
| 19 |
--- a/app-emulation/buildah/Manifest |
| 20 |
+++ b/app-emulation/buildah/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86 |
| 23 |
+DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d |
| 24 |
|
| 25 |
diff --git a/app-emulation/buildah/buildah-1.11.5.ebuild b/app-emulation/buildah/buildah-1.11.5-r1.ebuild |
| 26 |
similarity index 74% |
| 27 |
rename from app-emulation/buildah/buildah-1.11.5.ebuild |
| 28 |
rename to app-emulation/buildah/buildah-1.11.5-r1.ebuild |
| 29 |
index 2f7bb8f8c0d..792dc80accb 100644 |
| 30 |
--- a/app-emulation/buildah/buildah-1.11.5.ebuild |
| 31 |
+++ b/app-emulation/buildah/buildah-1.11.5-r1.ebuild |
| 32 |
@@ -12,7 +12,9 @@ SLOT="0" |
| 33 |
IUSE="selinux" |
| 34 |
EGIT_COMMIT="v${PV}" |
| 35 |
GIT_COMMIT="7c97335" |
| 36 |
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 37 |
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch" |
| 38 |
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
| 39 |
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}" |
| 40 |
RDEPEND="app-crypt/gpgme:= |
| 41 |
app-emulation/skopeo |
| 42 |
dev-libs/libgpg-error:= |
| 43 |
@@ -25,6 +27,10 @@ RESTRICT="test" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
default |
| 47 |
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \ |
| 48 |
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \ |
| 49 |
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die |
| 50 |
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" |
| 51 |
sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die |
| 52 |
|
| 53 |
[[ -f selinux_tag.sh ]] || die |
Archives