1 |
commit: 6054f419e41266317d49e42bb378f83c575b21d8 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 19 16:47:25 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 19 16:47:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6054f419 |
7 |
|
8 |
app-emulation/cri-o: Remove old versions |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
12 |
|
13 |
app-emulation/cri-o/Manifest | 6 -- |
14 |
app-emulation/cri-o/cri-o-1.10.6.ebuild | 105 ------------------------------ |
15 |
app-emulation/cri-o/cri-o-1.13.9.ebuild | 112 -------------------------------- |
16 |
app-emulation/cri-o/cri-o-1.15.1.ebuild | 107 ------------------------------ |
17 |
app-emulation/cri-o/cri-o-1.15.2.ebuild | 107 ------------------------------ |
18 |
app-emulation/cri-o/cri-o-1.16.3.ebuild | 97 --------------------------- |
19 |
app-emulation/cri-o/cri-o-1.17.0.ebuild | 95 --------------------------- |
20 |
app-emulation/cri-o/metadata.xml | 3 - |
21 |
8 files changed, 632 deletions(-) |
22 |
|
23 |
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest |
24 |
index 3c47d5db492..c6b29f8e29a 100644 |
25 |
--- a/app-emulation/cri-o/Manifest |
26 |
+++ b/app-emulation/cri-o/Manifest |
27 |
@@ -1,8 +1,2 @@ |
28 |
-DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894 |
29 |
-DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e |
30 |
-DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97 SHA512 2b9122692d84e8a6832d7172782c41d354185809cd3fa999951485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07 |
31 |
-DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 159bdf322540c3d49f44b1fc1106d1717706f7817e4621743078dfbb5d9088318d7dda5da54ff94ed43ea58204413d496ffda424ea94ed6fd0c6e090bbba37f0 SHA512 d30a27d98537cd73bf341267922b94434958bf5e5d3a26de3af2b7899fd9d860be12a194531f81fb704abed79eac1c5139271fab1e52b994b939dafab00f1cfd |
32 |
-DIST cri-o-1.16.3.tar.gz 12274620 BLAKE2B e297996184e765a89cc68adbb531eb249ad74804b05d233b4730fe56cb530e2d6d7f44ecf6939730a055acff43b0bdec13fd40583fcf003740e6dacc9770d868 SHA512 cf3d8748696e14a9fe7bb1f4e4ed5532a84367e1de42da89e1c85c33f249525a42000c74445b1f6859099a43d4076c4078efe5990a7e663795121d54d1ee1354 |
33 |
-DIST cri-o-1.17.0.tar.gz 10528650 BLAKE2B ba1240e602be576eb74bd9dd0c7b5d0ae3c78172902c74725ce3b85b90c739a79cf260b9ab441bc632eba85951ff1968a946824dd20849bb9ccae268b76e3fec SHA512 08b1ede35d44dd72f7a20ef02e3d27198d349d05b3fd41fc319bfba44dafdaf1843c1a6b04cd4d07ad80b5d2022376a8173b7459658a3c22011970561a1af308 |
34 |
DIST cri-o-1.17.1.tar.gz 10532728 BLAKE2B 12747b0161ca2fa7dc7e95fd4c000b9011402e65dac0885ed59a37a87b53907044d3b3c873d6fe82186313af6745e463ce84be259dae99793c6363794c76e16f SHA512 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332 |
35 |
DIST cri-o-1.18.3.tar.gz 11210469 BLAKE2B 16a9ed89c594c082e18d5a08ba1f87eaed600b95baed1e36c5b718e9dbaf52c7b482dbf6dba94a1cbc5e02f3dc58f0f21236b6b11c65fa60666d654e28c793fd SHA512 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640 |
36 |
|
37 |
diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild b/app-emulation/cri-o/cri-o-1.10.6.ebuild |
38 |
deleted file mode 100644 |
39 |
index a5292a57902..00000000000 |
40 |
--- a/app-emulation/cri-o/cri-o-1.10.6.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,105 +0,0 @@ |
43 |
-# Copyright 1999-2019 Gentoo Authors |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=6 |
47 |
- |
48 |
-EGIT_COMMIT="56d7d9a0750d7deb06182361837b690683f13dfe" |
49 |
-EGO_PN="github.com/kubernetes-incubator/${PN}" |
50 |
- |
51 |
-inherit golang-vcs-snapshot systemd |
52 |
- |
53 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
54 |
-HOMEPAGE="https://cri-o.io/" |
55 |
-SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
56 |
- |
57 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
58 |
-SLOT="0" |
59 |
-KEYWORDS="~amd64" |
60 |
-IUSE="btrfs +device-mapper ostree seccomp selinux" |
61 |
- |
62 |
-COMMON_DEPEND=" |
63 |
- app-crypt/gpgme:= |
64 |
- app-emulation/runc |
65 |
- dev-libs/glib:= |
66 |
- dev-libs/libassuan:= |
67 |
- dev-libs/libgpg-error:= |
68 |
- net-firewall/conntrack-tools |
69 |
- net-firewall/iptables |
70 |
- net-misc/cni-plugins |
71 |
- net-misc/socat |
72 |
- sys-apps/iproute2 |
73 |
- btrfs? ( sys-fs/btrfs-progs ) |
74 |
- device-mapper? ( sys-fs/lvm2:= ) |
75 |
- ostree? ( dev-util/ostree ) |
76 |
- seccomp? ( sys-libs/libseccomp:= ) |
77 |
- selinux? ( sys-libs/libselinux:= )" |
78 |
-DEPEND=" |
79 |
- ${COMMON_DEPEND} |
80 |
- dev-go/go-md2man" |
81 |
-RDEPEND="${COMMON_DEPEND}" |
82 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
83 |
- |
84 |
-src_prepare() { |
85 |
- default |
86 |
- |
87 |
- sed -e '/^GIT_.*/d' \ |
88 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
89 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
90 |
- -i Makefile || die |
91 |
- |
92 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
93 |
- -i contrib/systemd/* || die |
94 |
-} |
95 |
- |
96 |
-src_compile() { |
97 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
98 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
99 |
- hack/btrfs_installed_tag.sh || die; } |
100 |
- |
101 |
- [[ -f hack/libdm_installed.sh ]] || die |
102 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
103 |
- hack/libdm_installed.sh || die; } |
104 |
- |
105 |
- [[ -f hack/ostree_tag.sh ]] || die |
106 |
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \ |
107 |
- hack/ostree_tag.sh || die; } |
108 |
- |
109 |
- [[ -f hack/seccomp_tag.sh ]] || die |
110 |
- use seccomp || { echo -e "#!/bin/sh\ntrue" > \ |
111 |
- hack/seccomp_tag.sh || die; } |
112 |
- |
113 |
- [[ -f hack/selinux_tag.sh ]] || die |
114 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
115 |
- hack/selinux_tag.sh || die; } |
116 |
- |
117 |
- mkdir -p bin || die |
118 |
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ |
119 |
- emake binaries docs |
120 |
-} |
121 |
- |
122 |
-src_install() { |
123 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man |
124 |
- |
125 |
- keepdir /etc/crio |
126 |
- insinto /etc/crio |
127 |
- use seccomp && doins seccomp.json |
128 |
- |
129 |
- "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die |
130 |
- doins "${T}/crio.conf.example" |
131 |
- |
132 |
- newinitd "${FILESDIR}/crio.initd" crio |
133 |
- |
134 |
- insinto /etc/logrotate.d |
135 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
136 |
- |
137 |
- # Suppress crio log error messages triggered if these don't exist. |
138 |
- keepdir /etc/containers/oci/hooks.d |
139 |
- keepdir /usr/share/containers/oci/hooks.d |
140 |
- |
141 |
- # Suppress crio "Missing CNI default network" log message. |
142 |
- keepdir /etc/cni/net.d |
143 |
- insinto /etc/cni/net.d |
144 |
- doins contrib/cni/99-loopback.conf |
145 |
- |
146 |
- systemd_dounit contrib/systemd/* |
147 |
-} |
148 |
|
149 |
diff --git a/app-emulation/cri-o/cri-o-1.13.9.ebuild b/app-emulation/cri-o/cri-o-1.13.9.ebuild |
150 |
deleted file mode 100644 |
151 |
index 3331e9719be..00000000000 |
152 |
--- a/app-emulation/cri-o/cri-o-1.13.9.ebuild |
153 |
+++ /dev/null |
154 |
@@ -1,112 +0,0 @@ |
155 |
-# Copyright 1999-2019 Gentoo Authors |
156 |
-# Distributed under the terms of the GNU General Public License v2 |
157 |
- |
158 |
-EAPI=7 |
159 |
- |
160 |
-EGIT_COMMIT="d70609afd5e933948284aebf15966bdc098d28b3" |
161 |
-EGO_PN="github.com/kubernetes-sigs/${PN}" |
162 |
- |
163 |
-inherit golang-vcs-snapshot systemd |
164 |
- |
165 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
166 |
-HOMEPAGE="https://cri-o.io/" |
167 |
-SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
168 |
- |
169 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
170 |
-SLOT="0" |
171 |
-KEYWORDS="~amd64" |
172 |
-IUSE="btrfs +device-mapper ostree seccomp selinux" |
173 |
- |
174 |
-COMMON_DEPEND=" |
175 |
- app-crypt/gpgme:= |
176 |
- app-emulation/runc |
177 |
- dev-libs/glib:= |
178 |
- dev-libs/libassuan:= |
179 |
- dev-libs/libgpg-error:= |
180 |
- net-firewall/conntrack-tools |
181 |
- net-firewall/iptables |
182 |
- net-misc/cni-plugins |
183 |
- net-misc/socat |
184 |
- sys-apps/iproute2 |
185 |
- btrfs? ( sys-fs/btrfs-progs ) |
186 |
- device-mapper? ( sys-fs/lvm2:= ) |
187 |
- ostree? ( dev-util/ostree ) |
188 |
- seccomp? ( sys-libs/libseccomp:= ) |
189 |
- selinux? ( sys-libs/libselinux:= )" |
190 |
-DEPEND=" |
191 |
- ${COMMON_DEPEND} |
192 |
- dev-go/go-md2man" |
193 |
-RDEPEND="${COMMON_DEPEND}" |
194 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
195 |
- |
196 |
-src_prepare() { |
197 |
- default |
198 |
- |
199 |
- sed -e '/^GIT_.*/d' \ |
200 |
- -e '/ git diff --exit-code/d' \ |
201 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
202 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
203 |
- -i Makefile || die |
204 |
- |
205 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
206 |
- |
207 |
- sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
208 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
209 |
- -i Makefile.inc || die |
210 |
- |
211 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
212 |
- -i contrib/systemd/* || die |
213 |
-} |
214 |
- |
215 |
-src_compile() { |
216 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
217 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
218 |
- hack/btrfs_installed_tag.sh || die; } |
219 |
- |
220 |
- [[ -f hack/libdm_installed.sh ]] || die |
221 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
222 |
- hack/libdm_installed.sh || die; } |
223 |
- |
224 |
- [[ -f hack/ostree_tag.sh ]] || die |
225 |
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \ |
226 |
- hack/ostree_tag.sh || die; } |
227 |
- |
228 |
- [[ -f hack/seccomp_tag.sh ]] || die |
229 |
- use seccomp || { echo -e "#!/bin/sh\ntrue" > \ |
230 |
- hack/seccomp_tag.sh || die; } |
231 |
- |
232 |
- [[ -f hack/selinux_tag.sh ]] || die |
233 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
234 |
- hack/selinux_tag.sh || die; } |
235 |
- |
236 |
- mkdir -p bin || die |
237 |
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ |
238 |
- emake binaries docs |
239 |
-} |
240 |
- |
241 |
-src_install() { |
242 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man |
243 |
- |
244 |
- keepdir /etc/crio |
245 |
- insinto /etc/crio |
246 |
- use seccomp && doins seccomp.json |
247 |
- |
248 |
- "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die |
249 |
- doins "${T}/crio.conf.example" |
250 |
- |
251 |
- newinitd "${FILESDIR}/crio.initd" crio |
252 |
- |
253 |
- insinto /etc/logrotate.d |
254 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
255 |
- |
256 |
- # Suppress crio log error messages triggered if these don't exist. |
257 |
- keepdir /etc/containers/oci/hooks.d |
258 |
- keepdir /usr/share/containers/oci/hooks.d |
259 |
- |
260 |
- # Suppress crio "Missing CNI default network" log message. |
261 |
- keepdir /etc/cni/net.d |
262 |
- insinto /etc/cni/net.d |
263 |
- doins contrib/cni/99-loopback.conf |
264 |
- |
265 |
- systemd_dounit contrib/systemd/* |
266 |
-} |
267 |
|
268 |
diff --git a/app-emulation/cri-o/cri-o-1.15.1.ebuild b/app-emulation/cri-o/cri-o-1.15.1.ebuild |
269 |
deleted file mode 100644 |
270 |
index c439086a987..00000000000 |
271 |
--- a/app-emulation/cri-o/cri-o-1.15.1.ebuild |
272 |
+++ /dev/null |
273 |
@@ -1,107 +0,0 @@ |
274 |
-# Copyright 1999-2019 Gentoo Authors |
275 |
-# Distributed under the terms of the GNU General Public License v2 |
276 |
- |
277 |
-EAPI=7 |
278 |
- |
279 |
-EGIT_COMMIT="f0827bb332854ffcff2f4d9f64d68b8139970b3d" |
280 |
-EGO_PN="github.com/cri-o/${PN}" |
281 |
- |
282 |
-inherit golang-vcs-snapshot |
283 |
- |
284 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
285 |
-HOMEPAGE="https://cri-o.io/" |
286 |
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
287 |
- |
288 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
289 |
-SLOT="0" |
290 |
-KEYWORDS="~amd64" |
291 |
-IUSE="btrfs +device-mapper selinux systemd" |
292 |
- |
293 |
-COMMON_DEPEND=" |
294 |
- app-crypt/gpgme:= |
295 |
- app-emulation/runc |
296 |
- dev-libs/glib:= |
297 |
- dev-libs/libassuan:= |
298 |
- dev-libs/libgpg-error:= |
299 |
- net-firewall/conntrack-tools |
300 |
- net-firewall/iptables |
301 |
- net-misc/cni-plugins |
302 |
- net-misc/socat |
303 |
- sys-apps/iproute2 |
304 |
- sys-libs/libseccomp:= |
305 |
- btrfs? ( sys-fs/btrfs-progs ) |
306 |
- device-mapper? ( sys-fs/lvm2:= ) |
307 |
- selinux? ( sys-libs/libselinux:= ) |
308 |
- systemd? ( sys-apps/systemd:= )" |
309 |
-DEPEND=" |
310 |
- ${COMMON_DEPEND}" |
311 |
-RDEPEND="${COMMON_DEPEND} |
312 |
- !<app-emulation/libpod-1.3.2-r1" |
313 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
314 |
- |
315 |
-src_prepare() { |
316 |
- default |
317 |
- |
318 |
- # Avoid network-sandbox violations since go-1.13 |
319 |
- rm go.mod || die |
320 |
- |
321 |
- sed -e '/^GIT_.*/d' \ |
322 |
- -e '/ git diff --exit-code/d' \ |
323 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
324 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
325 |
- -i Makefile || die |
326 |
- |
327 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
328 |
- |
329 |
- sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
330 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
331 |
- -i Makefile.inc || die |
332 |
- |
333 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
334 |
- -i contrib/systemd/* || die |
335 |
- |
336 |
- if ! use systemd; then |
337 |
- sed -e 's| pkg-config --exists libsystemd-journal | false |' \ |
338 |
- -e 's| pkg-config --exists libsystemd | false |' \ |
339 |
- -i conmon/Makefile || die |
340 |
- fi |
341 |
-} |
342 |
- |
343 |
-src_compile() { |
344 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
345 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
346 |
- hack/btrfs_installed_tag.sh || die; } |
347 |
- |
348 |
- [[ -f hack/libdm_installed.sh ]] || die |
349 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
350 |
- hack/libdm_installed.sh || die; } |
351 |
- |
352 |
- [[ -f hack/selinux_tag.sh ]] || die |
353 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
354 |
- hack/selinux_tag.sh || die; } |
355 |
- |
356 |
- mkdir -p bin || die |
357 |
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ |
358 |
- emake all |
359 |
-} |
360 |
- |
361 |
-src_install() { |
362 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd |
363 |
- |
364 |
- keepdir /etc/crio |
365 |
- mv "${ED}/etc/crio/crio.conf"{,.example} || die |
366 |
- |
367 |
- newinitd "${FILESDIR}/crio.initd" crio |
368 |
- |
369 |
- insinto /etc/logrotate.d |
370 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
371 |
- |
372 |
- # Suppress crio log error messages triggered if these don't exist. |
373 |
- keepdir /etc/containers/oci/hooks.d |
374 |
- keepdir /usr/share/containers/oci/hooks.d |
375 |
- |
376 |
- # Suppress crio "Missing CNI default network" log message. |
377 |
- keepdir /etc/cni/net.d |
378 |
- insinto /etc/cni/net.d |
379 |
- doins contrib/cni/99-loopback.conf |
380 |
-} |
381 |
|
382 |
diff --git a/app-emulation/cri-o/cri-o-1.15.2.ebuild b/app-emulation/cri-o/cri-o-1.15.2.ebuild |
383 |
deleted file mode 100644 |
384 |
index c439086a987..00000000000 |
385 |
--- a/app-emulation/cri-o/cri-o-1.15.2.ebuild |
386 |
+++ /dev/null |
387 |
@@ -1,107 +0,0 @@ |
388 |
-# Copyright 1999-2019 Gentoo Authors |
389 |
-# Distributed under the terms of the GNU General Public License v2 |
390 |
- |
391 |
-EAPI=7 |
392 |
- |
393 |
-EGIT_COMMIT="f0827bb332854ffcff2f4d9f64d68b8139970b3d" |
394 |
-EGO_PN="github.com/cri-o/${PN}" |
395 |
- |
396 |
-inherit golang-vcs-snapshot |
397 |
- |
398 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
399 |
-HOMEPAGE="https://cri-o.io/" |
400 |
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
401 |
- |
402 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
403 |
-SLOT="0" |
404 |
-KEYWORDS="~amd64" |
405 |
-IUSE="btrfs +device-mapper selinux systemd" |
406 |
- |
407 |
-COMMON_DEPEND=" |
408 |
- app-crypt/gpgme:= |
409 |
- app-emulation/runc |
410 |
- dev-libs/glib:= |
411 |
- dev-libs/libassuan:= |
412 |
- dev-libs/libgpg-error:= |
413 |
- net-firewall/conntrack-tools |
414 |
- net-firewall/iptables |
415 |
- net-misc/cni-plugins |
416 |
- net-misc/socat |
417 |
- sys-apps/iproute2 |
418 |
- sys-libs/libseccomp:= |
419 |
- btrfs? ( sys-fs/btrfs-progs ) |
420 |
- device-mapper? ( sys-fs/lvm2:= ) |
421 |
- selinux? ( sys-libs/libselinux:= ) |
422 |
- systemd? ( sys-apps/systemd:= )" |
423 |
-DEPEND=" |
424 |
- ${COMMON_DEPEND}" |
425 |
-RDEPEND="${COMMON_DEPEND} |
426 |
- !<app-emulation/libpod-1.3.2-r1" |
427 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
428 |
- |
429 |
-src_prepare() { |
430 |
- default |
431 |
- |
432 |
- # Avoid network-sandbox violations since go-1.13 |
433 |
- rm go.mod || die |
434 |
- |
435 |
- sed -e '/^GIT_.*/d' \ |
436 |
- -e '/ git diff --exit-code/d' \ |
437 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
438 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
439 |
- -i Makefile || die |
440 |
- |
441 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
442 |
- |
443 |
- sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
444 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
445 |
- -i Makefile.inc || die |
446 |
- |
447 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
448 |
- -i contrib/systemd/* || die |
449 |
- |
450 |
- if ! use systemd; then |
451 |
- sed -e 's| pkg-config --exists libsystemd-journal | false |' \ |
452 |
- -e 's| pkg-config --exists libsystemd | false |' \ |
453 |
- -i conmon/Makefile || die |
454 |
- fi |
455 |
-} |
456 |
- |
457 |
-src_compile() { |
458 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
459 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
460 |
- hack/btrfs_installed_tag.sh || die; } |
461 |
- |
462 |
- [[ -f hack/libdm_installed.sh ]] || die |
463 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
464 |
- hack/libdm_installed.sh || die; } |
465 |
- |
466 |
- [[ -f hack/selinux_tag.sh ]] || die |
467 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
468 |
- hack/selinux_tag.sh || die; } |
469 |
- |
470 |
- mkdir -p bin || die |
471 |
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ |
472 |
- emake all |
473 |
-} |
474 |
- |
475 |
-src_install() { |
476 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd |
477 |
- |
478 |
- keepdir /etc/crio |
479 |
- mv "${ED}/etc/crio/crio.conf"{,.example} || die |
480 |
- |
481 |
- newinitd "${FILESDIR}/crio.initd" crio |
482 |
- |
483 |
- insinto /etc/logrotate.d |
484 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
485 |
- |
486 |
- # Suppress crio log error messages triggered if these don't exist. |
487 |
- keepdir /etc/containers/oci/hooks.d |
488 |
- keepdir /usr/share/containers/oci/hooks.d |
489 |
- |
490 |
- # Suppress crio "Missing CNI default network" log message. |
491 |
- keepdir /etc/cni/net.d |
492 |
- insinto /etc/cni/net.d |
493 |
- doins contrib/cni/99-loopback.conf |
494 |
-} |
495 |
|
496 |
diff --git a/app-emulation/cri-o/cri-o-1.16.3.ebuild b/app-emulation/cri-o/cri-o-1.16.3.ebuild |
497 |
deleted file mode 100644 |
498 |
index f0c8df12dba..00000000000 |
499 |
--- a/app-emulation/cri-o/cri-o-1.16.3.ebuild |
500 |
+++ /dev/null |
501 |
@@ -1,97 +0,0 @@ |
502 |
-# Copyright 1999-2019 Gentoo Authors |
503 |
-# Distributed under the terms of the GNU General Public License v2 |
504 |
- |
505 |
-EAPI=7 |
506 |
- |
507 |
-EGIT_COMMIT=dd73a465144f71031728f0de8439ddda08c98119 |
508 |
- |
509 |
-inherit go-module |
510 |
- |
511 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
512 |
-HOMEPAGE="https://cri-o.io/" |
513 |
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
514 |
- |
515 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
516 |
-SLOT="0" |
517 |
-KEYWORDS="~amd64" |
518 |
-IUSE="btrfs +device-mapper selinux systemd" |
519 |
- |
520 |
-COMMON_DEPEND=" |
521 |
- app-crypt/gpgme:= |
522 |
- app-emulation/conmon |
523 |
- app-emulation/runc |
524 |
- dev-libs/glib:= |
525 |
- dev-libs/libassuan:= |
526 |
- dev-libs/libgpg-error:= |
527 |
- net-firewall/conntrack-tools |
528 |
- net-firewall/iptables |
529 |
- net-misc/cni-plugins |
530 |
- net-misc/socat |
531 |
- sys-apps/iproute2 |
532 |
- sys-libs/libseccomp:= |
533 |
- btrfs? ( sys-fs/btrfs-progs ) |
534 |
- device-mapper? ( sys-fs/lvm2:= ) |
535 |
- selinux? ( sys-libs/libselinux:= ) |
536 |
- systemd? ( sys-apps/systemd:= )" |
537 |
-DEPEND=" |
538 |
- ${COMMON_DEPEND}" |
539 |
-RDEPEND="${COMMON_DEPEND} |
540 |
- !<app-emulation/libpod-1.3.2-r1" |
541 |
- |
542 |
-src_prepare() { |
543 |
- default |
544 |
- |
545 |
- sed -e '/^GIT_.*/d' \ |
546 |
- -e '/ git diff --exit-code/d' \ |
547 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
548 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
549 |
- -i Makefile || die |
550 |
- |
551 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
552 |
- |
553 |
- sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
554 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
555 |
- -i Makefile.inc || die |
556 |
- |
557 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
558 |
- -i contrib/systemd/* || die |
559 |
-} |
560 |
- |
561 |
-src_compile() { |
562 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
563 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
564 |
- hack/btrfs_installed_tag.sh || die; } |
565 |
- |
566 |
- [[ -f hack/libdm_installed.sh ]] || die |
567 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
568 |
- hack/libdm_installed.sh || die; } |
569 |
- |
570 |
- [[ -f hack/selinux_tag.sh ]] || die |
571 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
572 |
- hack/selinux_tag.sh || die; } |
573 |
- |
574 |
- mkdir -p bin || die |
575 |
- GOBIN="${S}/bin" \ |
576 |
- emake all |
577 |
-} |
578 |
- |
579 |
-src_install() { |
580 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd |
581 |
- |
582 |
- keepdir /etc/crio |
583 |
- mv "${ED}/etc/crio/crio.conf"{,.example} || die |
584 |
- |
585 |
- newinitd "${FILESDIR}/crio.initd" crio |
586 |
- |
587 |
- insinto /etc/logrotate.d |
588 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
589 |
- |
590 |
- # Suppress crio log error messages triggered if these don't exist. |
591 |
- keepdir /etc/containers/oci/hooks.d |
592 |
- keepdir /usr/share/containers/oci/hooks.d |
593 |
- |
594 |
- # Suppress crio "Missing CNI default network" log message. |
595 |
- keepdir /etc/cni/net.d |
596 |
- insinto /etc/cni/net.d |
597 |
- doins contrib/cni/99-loopback.conf |
598 |
-} |
599 |
|
600 |
diff --git a/app-emulation/cri-o/cri-o-1.17.0.ebuild b/app-emulation/cri-o/cri-o-1.17.0.ebuild |
601 |
deleted file mode 100644 |
602 |
index e5cd2811c96..00000000000 |
603 |
--- a/app-emulation/cri-o/cri-o-1.17.0.ebuild |
604 |
+++ /dev/null |
605 |
@@ -1,95 +0,0 @@ |
606 |
-# Copyright 1999-2019 Gentoo Authors |
607 |
-# Distributed under the terms of the GNU General Public License v2 |
608 |
- |
609 |
-EAPI=7 |
610 |
- |
611 |
-EGIT_COMMIT=6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3 |
612 |
- |
613 |
-inherit go-module |
614 |
- |
615 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
616 |
-HOMEPAGE="https://cri-o.io/" |
617 |
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
618 |
- |
619 |
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" |
620 |
-SLOT="0" |
621 |
-KEYWORDS="~amd64" |
622 |
-IUSE="btrfs +device-mapper selinux systemd" |
623 |
- |
624 |
-COMMON_DEPEND=" |
625 |
- app-crypt/gpgme:= |
626 |
- app-emulation/conmon |
627 |
- app-emulation/runc |
628 |
- dev-libs/glib:= |
629 |
- dev-libs/libassuan:= |
630 |
- dev-libs/libgpg-error:= |
631 |
- net-firewall/conntrack-tools |
632 |
- net-firewall/iptables |
633 |
- net-misc/cni-plugins |
634 |
- net-misc/socat |
635 |
- sys-apps/iproute2 |
636 |
- sys-libs/libseccomp:= |
637 |
- btrfs? ( sys-fs/btrfs-progs ) |
638 |
- device-mapper? ( sys-fs/lvm2:= ) |
639 |
- selinux? ( sys-libs/libselinux:= ) |
640 |
- systemd? ( sys-apps/systemd:= )" |
641 |
-DEPEND=" |
642 |
- ${COMMON_DEPEND}" |
643 |
-RDEPEND="${COMMON_DEPEND} |
644 |
- !<app-emulation/libpod-1.3.2-r1" |
645 |
- |
646 |
-src_prepare() { |
647 |
- default |
648 |
- |
649 |
- sed -e '/^GIT_.*/d' \ |
650 |
- -e '/ git diff --exit-code/d' \ |
651 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
652 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
653 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
654 |
- -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
655 |
- -i Makefile || die |
656 |
- |
657 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
658 |
- |
659 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
660 |
- -i contrib/systemd/* || die |
661 |
-} |
662 |
- |
663 |
-src_compile() { |
664 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
665 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
666 |
- hack/btrfs_installed_tag.sh || die; } |
667 |
- |
668 |
- [[ -f hack/libdm_installed.sh ]] || die |
669 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
670 |
- hack/libdm_installed.sh || die; } |
671 |
- |
672 |
- [[ -f hack/selinux_tag.sh ]] || die |
673 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
674 |
- hack/selinux_tag.sh || die; } |
675 |
- |
676 |
- mkdir -p bin || die |
677 |
- GOBIN="${S}/bin" \ |
678 |
- emake all |
679 |
-} |
680 |
- |
681 |
-src_install() { |
682 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd |
683 |
- |
684 |
- keepdir /etc/crio |
685 |
- mv "${ED}/etc/crio/crio.conf"{,.example} || die |
686 |
- |
687 |
- newinitd "${FILESDIR}/crio.initd" crio |
688 |
- |
689 |
- insinto /etc/logrotate.d |
690 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
691 |
- |
692 |
- # Suppress crio log error messages triggered if these don't exist. |
693 |
- keepdir /etc/containers/oci/hooks.d |
694 |
- keepdir /usr/share/containers/oci/hooks.d |
695 |
- |
696 |
- # Suppress crio "Missing CNI default network" log message. |
697 |
- keepdir /etc/cni/net.d |
698 |
- insinto /etc/cni/net.d |
699 |
- doins contrib/cni/99-loopback.conf |
700 |
-} |
701 |
|
702 |
diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml |
703 |
index 0ebb508fdee..ec23ec09fcc 100644 |
704 |
--- a/app-emulation/cri-o/metadata.xml |
705 |
+++ b/app-emulation/cri-o/metadata.xml |
706 |
@@ -21,9 +21,6 @@ |
707 |
Enables dependencies for the "devicemapper" graph driver, including |
708 |
necessary kernel flags. |
709 |
</flag> |
710 |
- <flag name="ostree"> |
711 |
- Enables dependencies for handling of OSTree images. |
712 |
- </flag> |
713 |
</use> |
714 |
<upstream> |
715 |
<remote-id type="github">cri-o/cri-o</remote-id> |