| 1 |
commit: fe13a335bff1e0ebb1ac5d105ce4d067163e4154 |
| 2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 18 14:25:56 2018 +0000 |
| 4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 18 14:25:56 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe13a335 |
| 7 |
|
| 8 |
app-emulation/containerd: Version bump to 1.1.2 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 11 |
|
| 12 |
app-emulation/containerd/Manifest | 1 + |
| 13 |
app-emulation/containerd/containerd-1.1.2.ebuild | 55 ++++++++++++++++++++++++ |
| 14 |
app-emulation/containerd/metadata.xml | 2 + |
| 15 |
3 files changed, 58 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest |
| 18 |
index 30ef8cd533f..669fc87de20 100644 |
| 19 |
--- a/app-emulation/containerd/Manifest |
| 20 |
+++ b/app-emulation/containerd/Manifest |
| 21 |
@@ -3,3 +3,4 @@ DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517 |
| 22 |
DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401e49459d1724376434265dddddd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586 SHA512 a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7edddd9 |
| 23 |
DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42 |
| 24 |
DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd |
| 25 |
+DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c |
| 26 |
|
| 27 |
diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild b/app-emulation/containerd/containerd-1.1.2.ebuild |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..2aebd40c413 |
| 30 |
--- /dev/null |
| 31 |
+++ b/app-emulation/containerd/containerd-1.1.2.ebuild |
| 32 |
@@ -0,0 +1,55 @@ |
| 33 |
+# Copyright 1999-2018 Gentoo Foundation |
| 34 |
+# Distributed under the terms of the GNU General Public License v2 |
| 35 |
+ |
| 36 |
+EAPI=6 |
| 37 |
+EGO_PN="github.com/containerd/${PN}" |
| 38 |
+ |
| 39 |
+inherit toolchain-funcs |
| 40 |
+ |
| 41 |
+if [[ ${PV} == *9999 ]]; then |
| 42 |
+ inherit golang-vcs |
| 43 |
+else |
| 44 |
+ MY_PV="${PV/_rc/-rc.}" |
| 45 |
+ EGIT_COMMIT="v${MY_PV}" |
| 46 |
+ CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e" |
| 47 |
+ SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 48 |
+ KEYWORDS="~amd64 ~arm ~ppc64" |
| 49 |
+ inherit golang-vcs-snapshot |
| 50 |
+fi |
| 51 |
+ |
| 52 |
+DESCRIPTION="A daemon to control runC" |
| 53 |
+HOMEPAGE="https://containerd.tools" |
| 54 |
+ |
| 55 |
+LICENSE="Apache-2.0" |
| 56 |
+SLOT="0" |
| 57 |
+IUSE="apparmor +btrfs +cri hardened +seccomp" |
| 58 |
+ |
| 59 |
+DEPEND="btrfs? ( sys-fs/btrfs-progs ) |
| 60 |
+ seccomp? ( sys-libs/libseccomp )" |
| 61 |
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 |
| 62 |
+ >=app-emulation/runc-1.0.0_rc4 ) |
| 63 |
+ seccomp? ( sys-libs/libseccomp )" |
| 64 |
+ |
| 65 |
+S=${WORKDIR}/${P}/src/${EGO_PN} |
| 66 |
+ |
| 67 |
+RESTRICT="test" |
| 68 |
+ |
| 69 |
+src_prepare() { |
| 70 |
+ default |
| 71 |
+ if [[ ${PV} != *9999* ]]; then |
| 72 |
+ sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
| 73 |
+ -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ |
| 74 |
+ -e "s/-s -w//" \ |
| 75 |
+ Makefile || die |
| 76 |
+ fi |
| 77 |
+} |
| 78 |
+ |
| 79 |
+src_compile() { |
| 80 |
+ local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") ) |
| 81 |
+ export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
| 82 |
+ LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}" |
| 83 |
+} |
| 84 |
+ |
| 85 |
+src_install() { |
| 86 |
+ dobin bin/containerd{-shim,-stress,} bin/ctr |
| 87 |
+} |
| 88 |
|
| 89 |
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml |
| 90 |
index 7cc46305346..a28d7bea81a 100644 |
| 91 |
--- a/app-emulation/containerd/metadata.xml |
| 92 |
+++ b/app-emulation/containerd/metadata.xml |
| 93 |
@@ -21,7 +21,9 @@ |
| 94 |
<name>William Hubbs</name> |
| 95 |
</maintainer> |
| 96 |
<use> |
| 97 |
+ <flag name="apparmor">Support for AppArmor</flag> |
| 98 |
<flag name="btrfs">Support for BTRFS snapshot driver</flag> |
| 99 |
+ <flag name="cri">Support for Kubernetes CRI</flag> |
| 100 |
</use> |
| 101 |
<upstream> |
| 102 |
<remote-id type="github">docker/containerd</remote-id> |
Archives