[gentoo-commits] repo/gentoo:master commit in: app-emulation/buildah/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/buildah/
Date: Tue, 26 Nov 2019 04:18:54 +0000 (UTC)	[thread overview]
Message-ID: <1574741929.40f1a9aee7d5ef20dfbd669135ba253ee93d4077.zmedico@gentoo> (raw)

commit:     40f1a9aee7d5ef20dfbd669135ba253ee93d4077
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 04:12:52 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 04:18:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f1a9ae

app-emulation/buildah: add upstream VFS user xattrs patch

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-emulation/buildah/Manifest                                    | 1 +
 .../buildah/{buildah-1.11.5.ebuild => buildah-1.11.5-r1.ebuild}   | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 4cbdecb560f..f2f644ce304 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1 +1,2 @@
 DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
+DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d

diff --git a/app-emulation/buildah/buildah-1.11.5.ebuild b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
similarity index 74%
rename from app-emulation/buildah/buildah-1.11.5.ebuild
rename to app-emulation/buildah/buildah-1.11.5-r1.ebuild
index 2f7bb8f8c0d..792dc80accb 100644
--- a/app-emulation/buildah/buildah-1.11.5.ebuild
+++ b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
@@ -12,7 +12,9 @@ SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
 GIT_COMMIT="7c97335"
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
 	dev-libs/libgpg-error:=
@@ -25,6 +27,10 @@ RESTRICT="test"
 
 src_prepare() {
 	default
+	sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+		"${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+		"${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+	eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
 	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
 
 	[[ -f selinux_tag.sh ]] || die

next             reply	other threads:[~2019-11-26  4:18 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-26  4:18 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-17  2:16 [gentoo-commits] repo/gentoo:master commit in: app-emulation/buildah/ Sam James
2021-11-14  8:38 Sam James
2021-10-13  4:57 Zac Medico
2021-06-14 17:41 Zac Medico
2021-06-11 19:28 William Hubbs
2021-05-26 20:04 William Hubbs
2021-04-26 23:46 Zac Medico
2021-04-26 23:46 Zac Medico
2021-02-25 21:22 Zac Medico
2021-02-25 21:17 Zac Medico
2020-09-12  6:08 Zac Medico
2020-08-29 23:04 Zac Medico
2020-08-29 23:04 Zac Medico
2020-08-29 22:45 Sam James
2020-08-01 21:10 Zac Medico
2020-08-01 20:25 Zac Medico
2020-08-01 20:25 Zac Medico
2020-04-16 20:18 William Hubbs
2020-04-03 16:20 William Hubbs
2020-04-02  0:23 Zac Medico
2020-04-02  0:23 Zac Medico
2020-03-26 15:54 William Hubbs
2020-03-20  4:13 Zac Medico
2020-03-05  5:27 Zac Medico
2020-02-08  3:29 Zac Medico
2020-01-15 20:33 Zac Medico
2019-12-13 22:00 Zac Medico
2019-12-13 21:52 Zac Medico
2019-11-26  3:29 Zac Medico
2019-11-16 10:10 Zac Medico
2019-11-15 21:27 Zac Medico
2019-10-18  4:59 Zac Medico
2019-10-18  4:45 Zac Medico
2019-09-19  3:17 Zac Medico
2019-09-19  3:17 Zac Medico
2019-09-13 17:08 Zac Medico
2019-09-12 20:42 Zac Medico
2019-09-05 18:01 Zac Medico
2019-08-08 19:45 Zac Medico
2019-08-08 19:42 Zac Medico
2019-08-02 19:32 Zac Medico
2019-07-21  5:19 Zac Medico
2019-07-21  5:02 Zac Medico
2019-06-16 21:25 Zac Medico
2019-06-16 21:17 Zac Medico
2019-06-16 21:07 Zac Medico
2019-06-04 16:53 Zac Medico
2019-06-04 16:46 Zac Medico
2019-06-04 16:43 Zac Medico
2019-05-09 17:06 Zac Medico
2019-04-17 17:30 Zac Medico
2019-04-17 17:27 Zac Medico
2019-03-13 16:32 Zac Medico
2019-02-22 19:05 Zac Medico
2019-02-22 18:29 Zac Medico
2019-02-02  9:25 Zac Medico
2018-11-28  3:57 Zac Medico
2018-11-04  4:49 Zac Medico
2018-08-29  2:05 Zac Medico
2018-08-07  1:08 Zac Medico
2018-08-07  1:08 Zac Medico
2018-07-24  3:57 Zac Medico
2018-06-28 19:20 Zac Medico
2018-06-19 20:50 Zac Medico
2018-06-18  4:53 Zac Medico
2018-06-18  4:43 Zac Medico
2018-05-15  7:07 Zac Medico
2018-05-15  3:05 Zac Medico

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4cbdecb560 dfblob:f2f644ce30 dfblob:2f7bb8f8c0
dfblob:792dc80acc )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-emulation/buildah/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1574741929.40f1a9aee7d5ef20dfbd669135ba253ee93d4077.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox