1 |
commit: b8f6aff9acb4cbc32d79486ecdff09e4adf5d5f4 |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 7 12:01:18 2019 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 7 12:01:18 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f6aff9 |
7 |
|
8 |
app-emulation/containerd: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
11 |
Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org> |
12 |
|
13 |
app-emulation/containerd/Manifest | 3 -- |
14 |
app-emulation/containerd/containerd-1.1.1.ebuild | 54 --------------------- |
15 |
.../containerd/containerd-1.2.0-r1.ebuild | 56 ---------------------- |
16 |
app-emulation/containerd/containerd-1.2.0.ebuild | 55 --------------------- |
17 |
app-emulation/containerd/containerd-1.2.1.ebuild | 56 ---------------------- |
18 |
...p20180223-remove-c-constant-redefinitions.patch | 38 --------------- |
19 |
6 files changed, 262 deletions(-) |
20 |
|
21 |
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest |
22 |
index 62e4ec779c2..1aba2d6949e 100644 |
23 |
--- a/app-emulation/containerd/Manifest |
24 |
+++ b/app-emulation/containerd/Manifest |
25 |
@@ -1,8 +1,5 @@ |
26 |
DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c |
27 |
-DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd |
28 |
DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c |
29 |
DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8 |
30 |
-DIST containerd-1.2.0.tar.gz 4605096 BLAKE2B 5bcfb252933d4f8d5ab6c7e91505cfec34137545121440cd6935e05cd3c62a4969fff8b90b628634c01cc9a4dc3901c307604ab30f45a03dd20112653da9437d SHA512 f7e1ede8db253c666dc9d68642951a427722945da60acf8631312377c84aab14c7a8b14e81f9a63ab8f909d25eb55911c0f2eef68f11380c66cd77bada8577bd |
31 |
-DIST containerd-1.2.1.tar.gz 4605947 BLAKE2B 340daac847eaa653d15894fd65c190702807400dfb8293b5a2507b9a13a86752c00357cf6aeb3735c57878c34f79c35076d7087a905ee7efe7971746c792a212 SHA512 0949299afe17e269a6c551e865e500afeeaba700cf78bb12fef4af8e6d48a2f699976e81dad44d797bb13079361f5d5e05e9abe903a3b158af93f2aaa95712e5 |
32 |
DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff |
33 |
DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897 SHA512 01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d |
34 |
|
35 |
diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild b/app-emulation/containerd/containerd-1.1.1.ebuild |
36 |
deleted file mode 100644 |
37 |
index 0dc6845f4ea..00000000000 |
38 |
--- a/app-emulation/containerd/containerd-1.1.1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,54 +0,0 @@ |
41 |
-# Copyright 1999-2018 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=6 |
45 |
-EGO_PN="github.com/containerd/${PN}" |
46 |
- |
47 |
-inherit toolchain-funcs |
48 |
- |
49 |
-if [[ ${PV} == *9999 ]]; then |
50 |
- inherit golang-vcs |
51 |
-else |
52 |
- MY_PV="${PV/_rc/-rc.}" |
53 |
- EGIT_COMMIT="v${MY_PV}" |
54 |
- CONTAINERD_COMMIT="d64c661f1d51c48782c9cec8fda7604785f93587" |
55 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
56 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
57 |
- inherit golang-vcs-snapshot |
58 |
-fi |
59 |
- |
60 |
-DESCRIPTION="A daemon to control runC" |
61 |
-HOMEPAGE="https://containerd.tools" |
62 |
- |
63 |
-LICENSE="Apache-2.0" |
64 |
-SLOT="0" |
65 |
-IUSE="+btrfs hardened" |
66 |
- |
67 |
-DEPEND="btrfs? ( sys-fs/btrfs-progs )" |
68 |
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 |
69 |
- >=app-emulation/runc-1.0.0_rc4 ) |
70 |
- sys-libs/libseccomp" |
71 |
- |
72 |
-S=${WORKDIR}/${P}/src/${EGO_PN} |
73 |
- |
74 |
-RESTRICT="test" |
75 |
- |
76 |
-src_prepare() { |
77 |
- default |
78 |
- if [[ ${PV} != *9999* ]]; then |
79 |
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
80 |
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ |
81 |
- -e "s/-s -w//" \ |
82 |
- Makefile || die |
83 |
- fi |
84 |
-} |
85 |
- |
86 |
-src_compile() { |
87 |
- local options=( $(usex btrfs "" "no_btrfs") ) |
88 |
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
89 |
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}" |
90 |
-} |
91 |
- |
92 |
-src_install() { |
93 |
- dobin bin/containerd{-shim,-stress,} bin/ctr |
94 |
-} |
95 |
|
96 |
diff --git a/app-emulation/containerd/containerd-1.2.0-r1.ebuild b/app-emulation/containerd/containerd-1.2.0-r1.ebuild |
97 |
deleted file mode 100644 |
98 |
index 27e3a753155..00000000000 |
99 |
--- a/app-emulation/containerd/containerd-1.2.0-r1.ebuild |
100 |
+++ /dev/null |
101 |
@@ -1,56 +0,0 @@ |
102 |
-# Copyright 1999-2018 Gentoo Authors |
103 |
-# Distributed under the terms of the GNU General Public License v2 |
104 |
- |
105 |
-EAPI=6 |
106 |
-EGO_PN="github.com/containerd/${PN}" |
107 |
- |
108 |
-inherit toolchain-funcs |
109 |
- |
110 |
-if [[ ${PV} == *9999 ]]; then |
111 |
- inherit golang-vcs |
112 |
-else |
113 |
- MY_PV="${PV/_rc/-rc.}" |
114 |
- EGIT_COMMIT="v${MY_PV}" |
115 |
- CONTAINERD_COMMIT="c4446665cb9c30056f4998ed953e6d4ff22c7c39" |
116 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
117 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
118 |
- inherit golang-vcs-snapshot |
119 |
-fi |
120 |
- |
121 |
-DESCRIPTION="A daemon to control runC" |
122 |
-HOMEPAGE="https://containerd.tools" |
123 |
- |
124 |
-LICENSE="Apache-2.0" |
125 |
-SLOT="0" |
126 |
-IUSE="apparmor +btrfs +cri hardened +seccomp" |
127 |
- |
128 |
-DEPEND="btrfs? ( sys-fs/btrfs-progs ) |
129 |
- seccomp? ( sys-libs/libseccomp )" |
130 |
-RDEPEND=">=app-emulation/runc-1.0.0_rc5 |
131 |
- seccomp? ( sys-libs/libseccomp )" |
132 |
- |
133 |
-S=${WORKDIR}/${P}/src/${EGO_PN} |
134 |
- |
135 |
-RESTRICT="test" |
136 |
- |
137 |
-src_prepare() { |
138 |
- default |
139 |
- if [[ ${PV} != *9999* ]]; then |
140 |
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
141 |
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ |
142 |
- -e "s/-s -w//" \ |
143 |
- Makefile || die |
144 |
- fi |
145 |
-} |
146 |
- |
147 |
-src_compile() { |
148 |
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") ) |
149 |
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
150 |
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake |
151 |
-} |
152 |
- |
153 |
-src_install() { |
154 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
155 |
- dodir /var/lib/containerd |
156 |
- dobin bin/containerd{-shim,-stress,} bin/ctr |
157 |
-} |
158 |
|
159 |
diff --git a/app-emulation/containerd/containerd-1.2.0.ebuild b/app-emulation/containerd/containerd-1.2.0.ebuild |
160 |
deleted file mode 100644 |
161 |
index d7d5430a826..00000000000 |
162 |
--- a/app-emulation/containerd/containerd-1.2.0.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,55 +0,0 @@ |
165 |
-# Copyright 1999-2018 Gentoo Authors |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
- |
168 |
-EAPI=6 |
169 |
-EGO_PN="github.com/containerd/${PN}" |
170 |
- |
171 |
-inherit toolchain-funcs |
172 |
- |
173 |
-if [[ ${PV} == *9999 ]]; then |
174 |
- inherit golang-vcs |
175 |
-else |
176 |
- MY_PV="${PV/_rc/-rc.}" |
177 |
- EGIT_COMMIT="v${MY_PV}" |
178 |
- CONTAINERD_COMMIT="c4446665cb9c30056f4998ed953e6d4ff22c7c39" |
179 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
180 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
181 |
- inherit golang-vcs-snapshot |
182 |
-fi |
183 |
- |
184 |
-DESCRIPTION="A daemon to control runC" |
185 |
-HOMEPAGE="https://containerd.tools" |
186 |
- |
187 |
-LICENSE="Apache-2.0" |
188 |
-SLOT="0" |
189 |
-IUSE="apparmor +btrfs +cri hardened +seccomp" |
190 |
- |
191 |
-DEPEND="btrfs? ( sys-fs/btrfs-progs ) |
192 |
- seccomp? ( sys-libs/libseccomp )" |
193 |
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 |
194 |
- >=app-emulation/runc-1.0.0_rc4 ) |
195 |
- seccomp? ( sys-libs/libseccomp )" |
196 |
- |
197 |
-S=${WORKDIR}/${P}/src/${EGO_PN} |
198 |
- |
199 |
-RESTRICT="test" |
200 |
- |
201 |
-src_prepare() { |
202 |
- default |
203 |
- if [[ ${PV} != *9999* ]]; then |
204 |
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
205 |
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ |
206 |
- -e "s/-s -w//" \ |
207 |
- Makefile || die |
208 |
- fi |
209 |
-} |
210 |
- |
211 |
-src_compile() { |
212 |
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") ) |
213 |
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
214 |
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake |
215 |
-} |
216 |
- |
217 |
-src_install() { |
218 |
- dobin bin/containerd{-shim,-stress,} bin/ctr |
219 |
-} |
220 |
|
221 |
diff --git a/app-emulation/containerd/containerd-1.2.1.ebuild b/app-emulation/containerd/containerd-1.2.1.ebuild |
222 |
deleted file mode 100644 |
223 |
index c9791d3160d..00000000000 |
224 |
--- a/app-emulation/containerd/containerd-1.2.1.ebuild |
225 |
+++ /dev/null |
226 |
@@ -1,56 +0,0 @@ |
227 |
-# Copyright 1999-2018 Gentoo Authors |
228 |
-# Distributed under the terms of the GNU General Public License v2 |
229 |
- |
230 |
-EAPI=6 |
231 |
-EGO_PN="github.com/containerd/${PN}" |
232 |
- |
233 |
-inherit toolchain-funcs |
234 |
- |
235 |
-if [[ ${PV} == *9999 ]]; then |
236 |
- inherit golang-vcs |
237 |
-else |
238 |
- MY_PV="${PV/_rc/-rc.}" |
239 |
- EGIT_COMMIT="v${MY_PV}" |
240 |
- CONTAINERD_COMMIT="9b32062dc1f5a7c2564315c269b5059754f12b9d" |
241 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
242 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
243 |
- inherit golang-vcs-snapshot |
244 |
-fi |
245 |
- |
246 |
-DESCRIPTION="A daemon to control runC" |
247 |
-HOMEPAGE="https://containerd.tools" |
248 |
- |
249 |
-LICENSE="Apache-2.0" |
250 |
-SLOT="0" |
251 |
-IUSE="apparmor +btrfs +cri hardened +seccomp" |
252 |
- |
253 |
-DEPEND="btrfs? ( sys-fs/btrfs-progs ) |
254 |
- seccomp? ( sys-libs/libseccomp )" |
255 |
-RDEPEND=">=app-emulation/runc-1.0.0_rc5 |
256 |
- seccomp? ( sys-libs/libseccomp )" |
257 |
- |
258 |
-S=${WORKDIR}/${P}/src/${EGO_PN} |
259 |
- |
260 |
-RESTRICT="test" |
261 |
- |
262 |
-src_prepare() { |
263 |
- default |
264 |
- if [[ ${PV} != *9999* ]]; then |
265 |
- sed -i -e "s/git describe --match.*$/echo ${PV})/"\ |
266 |
- -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ |
267 |
- -e "s/-s -w//" \ |
268 |
- Makefile || die |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-src_compile() { |
273 |
- local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") ) |
274 |
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor |
275 |
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake |
276 |
-} |
277 |
- |
278 |
-src_install() { |
279 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
280 |
- dodir /var/lib/containerd |
281 |
- dobin bin/containerd{-shim,-stress,} bin/ctr |
282 |
-} |
283 |
|
284 |
diff --git a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch |
285 |
deleted file mode 100644 |
286 |
index f08fab6e592..00000000000 |
287 |
--- a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch |
288 |
+++ /dev/null |
289 |
@@ -1,38 +0,0 @@ |
290 |
-From 9686d822284aa8fc9d4d136cc01314f5bf455cba Mon Sep 17 00:00:00 2001 |
291 |
-From: Stephen J Day <stephen.day@××××××.com> |
292 |
-Date: Fri, 2 Mar 2018 13:23:31 -0800 |
293 |
-Subject: [PATCH] btrfs: remove C constant redefinitions |
294 |
- |
295 |
-Signed-off-by: Stephen J Day <stephen.day@××××××.com> |
296 |
---- |
297 |
- btrfs.go | 10 +++------- |
298 |
- 1 file changed, 3 insertions(+), 7 deletions(-) |
299 |
- |
300 |
-diff --git a/vendor/github.com/containerd/btrfs/btrfs.go b/vendor/github.com/containerd/btrfs/btrfs.go |
301 |
-index 1deab47..efdf528 100644 |
302 |
---- a/vendor/github.com/containerd/btrfs/btrfs.go |
303 |
-+++ b/vendor/github.com/containerd/btrfs/btrfs.go |
304 |
-@@ -7,10 +7,6 @@ import "sort" |
305 |
- #include <btrfs/ioctl.h> |
306 |
- #include "btrfs.h" |
307 |
- |
308 |
--// Required because Go has struct casting rules for negative numbers |
309 |
--const __u64 u64_BTRFS_LAST_FREE_OBJECTID = (__u64)BTRFS_LAST_FREE_OBJECTID; |
310 |
--const __u64 negative_one = (__u64)-1; |
311 |
-- |
312 |
- static char* get_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct) { |
313 |
- return btrfs_struct->name; |
314 |
- } |
315 |
-@@ -100,9 +96,9 @@ func subvolMap(path string) (map[uint64]*Info, error) { |
316 |
- args.key.min_type = C.BTRFS_ROOT_ITEM_KEY |
317 |
- args.key.max_type = C.BTRFS_ROOT_BACKREF_KEY |
318 |
- args.key.min_objectid = C.BTRFS_FS_TREE_OBJECTID |
319 |
-- args.key.max_objectid = C.u64_BTRFS_LAST_FREE_OBJECTID |
320 |
-- args.key.max_offset = C.negative_one |
321 |
-- args.key.max_transid = C.negative_one |
322 |
-+ args.key.max_objectid = C.BTRFS_LAST_FREE_OBJECTID |
323 |
-+ args.key.max_offset = ^C.__u64(0) |
324 |
-+ args.key.max_transid = ^C.__u64(0) |
325 |
- |
326 |
- subvolsByID := make(map[uint64]*Info) |
327 |
- |