1 |
commit: 9bfb16653f6b40a9d003fbfedc3f5a7c5c4486d6 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 29 02:00:49 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 29 02:05:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bfb1665 |
7 |
|
8 |
app-emulation/buildah: revbump to 1.3-r1 for issue 966 |
9 |
|
10 |
Add patch for "layer not known" corruption issue 966. |
11 |
|
12 |
See: https://github.com/projectatomic/buildah/issues/966 |
13 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
14 |
|
15 |
app-emulation/buildah/Manifest | 1 + |
16 |
app-emulation/buildah/buildah-1.3-r1.ebuild | 64 +++++++++++++++++++++++++++++ |
17 |
2 files changed, 65 insertions(+) |
18 |
|
19 |
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest |
20 |
index 202a34616e2..f940dd365b8 100644 |
21 |
--- a/app-emulation/buildah/Manifest |
22 |
+++ b/app-emulation/buildah/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST buildah-1.2.tar.gz 4403310 BLAKE2B df3a1d12a41e9d585d3191103140fc232a2c247283996f394bd151f61615057b15d934e165be47794465c30217c32b3e6b53fbf4d2ef5a2f3349840dadad8171 SHA512 0aac0a80c3c50f0171199e549c0321ce1a756ca838dd9d92b0b0d58bd6b4e212390642c8a4a2aea794616292058624ab0c8707d2ea0cdcbcc555b387df611dc2 |
25 |
+DIST buildah-1.3-issue-966-containers-storage-c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch 4507 BLAKE2B 85a02751a91a73f1f99a1ae138e712304feeb46a40c792f4ec4ac895ce074d15eab4d76bf5e9be759254d0a023371c074a633607a689b42d238ac3f32b4e1d3d SHA512 63c74989dc649582170fc6657c9bfc805bcec6c4aa31017d53c4fa0f86acf00986adf05a8101605963eb3a358d237aad43c124ebcb5be635cff85efe4aa1eaa4 |
26 |
DIST buildah-1.3.tar.gz 4486873 BLAKE2B 35fb62626d2466495da47579cf4ab23603797ef42a9308245fa97c87a91fcb978f4d02724ce79c2b4ac620d9868ca8974e4701ba6a96ccf739e5ccb4e6d9693a SHA512 c8e161254495cb652caf9a54a051155008e41575487d26aacd38355f0a447ae0e8973b33a978e6a2d5a6c8105400d49dae46878c5f3631ab51aa3556d5033ccd |
27 |
|
28 |
diff --git a/app-emulation/buildah/buildah-1.3-r1.ebuild b/app-emulation/buildah/buildah-1.3-r1.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..ff5716f0045 |
31 |
--- /dev/null |
32 |
+++ b/app-emulation/buildah/buildah-1.3-r1.ebuild |
33 |
@@ -0,0 +1,64 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+inherit bash-completion-r1 golang-vcs-snapshot |
39 |
+ |
40 |
+KEYWORDS="~amd64" |
41 |
+DESCRIPTION="A tool that facilitates building OCI images" |
42 |
+HOMEPAGE="https://github.com/projectatomic/buildah" |
43 |
+LICENSE="Apache-2.0" |
44 |
+SLOT="0" |
45 |
+IUSE="ostree selinux" |
46 |
+EGO_PN="${HOMEPAGE#*//}" |
47 |
+EGIT_COMMIT="v${PV}" |
48 |
+GIT_COMMIT="4888163" |
49 |
+CONTAINERS_STORAGE_PATCH=c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch |
50 |
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
51 |
+ https://github.com/containers/storage/commit/${CONTAINERS_STORAGE_PATCH} -> buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" |
52 |
+RDEPEND="app-crypt/gpgme:= |
53 |
+ app-emulation/skopeo |
54 |
+ dev-libs/libgpg-error:= |
55 |
+ dev-libs/libassuan:= |
56 |
+ sys-fs/lvm2:= |
57 |
+ sys-libs/libseccomp:= |
58 |
+ selinux? ( sys-libs/libselinux:= )" |
59 |
+DEPEND="${RDEPEND}" |
60 |
+RESTRICT="test" |
61 |
+REQUIRED_USE="!selinux? ( !ostree )" |
62 |
+S="${WORKDIR}/${P}/src/${EGO_PN}" |
63 |
+ |
64 |
+src_prepare() { |
65 |
+ # Apply "layer not known" corruption fix for https://github.com/projectatomic/buildah/issues/966. |
66 |
+ sed 's:[ab]/:\0vendor/github.com/containers/storage/:g' < \ |
67 |
+ "${DISTDIR}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" > \ |
68 |
+ "${T}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" || die |
69 |
+ eapply "${T}/buildah-1.3-issue-966-containers-storage-${CONTAINERS_STORAGE_PATCH}" |
70 |
+ |
71 |
+ default |
72 |
+ sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die |
73 |
+ |
74 |
+ [[ -f ostree_tag.sh ]] || die |
75 |
+ use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \ |
76 |
+ ostree_tag.sh || die; } |
77 |
+ |
78 |
+ [[ -f selinux_tag.sh ]] || die |
79 |
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
80 |
+ selinux_tag.sh || die; } |
81 |
+} |
82 |
+ |
83 |
+src_compile() { |
84 |
+ GOPATH="${WORKDIR}/${P}" emake all |
85 |
+} |
86 |
+ |
87 |
+src_install() { |
88 |
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md |
89 |
+ doman docs/*.1 |
90 |
+ dodoc -r docs/tutorials |
91 |
+ dobin ${PN} imgtype |
92 |
+ dobashcomp contrib/completions/bash/buildah |
93 |
+} |
94 |
+ |
95 |
+src_test() { |
96 |
+ GOPATH="${WORKDIR}/${P}" emake test-unit |
97 |
+} |