1 |
commit: 02ceffca106c927189b518e48585ae4777df7e04 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 1 00:11:20 2019 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 1 00:11:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ceffca |
7 |
|
8 |
app-emulation/cri-o: remove old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
12 |
|
13 |
app-emulation/cri-o/Manifest | 2 - |
14 |
app-emulation/cri-o/cri-o-1.13.5.ebuild | 112 -------------------------------- |
15 |
app-emulation/cri-o/cri-o-1.13.7.ebuild | 112 -------------------------------- |
16 |
3 files changed, 226 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest |
19 |
index a6b77e4ee2d..3e19b8d9e83 100644 |
20 |
--- a/app-emulation/cri-o/Manifest |
21 |
+++ b/app-emulation/cri-o/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894 |
24 |
-DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c SHA512 116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875 |
25 |
-DIST cri-o-1.13.7.tar.gz 6657183 BLAKE2B 8073211bb188bf6a03615fe5d3f931d45dee09bb506316e80c6b0914d3b798e77e194d6f31e74e314406af28c4a882e45250f8c6792c82d9b0e3cceb0750cf1a SHA512 5056f26decc96798738aa67350b0d7353ac025518c82e2591f4541284bbc3620976a97dcc805429adc748131f38d13edcdb77c3b6f1ba6b93f672637437acb10 |
26 |
DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e |
27 |
|
28 |
diff --git a/app-emulation/cri-o/cri-o-1.13.5.ebuild b/app-emulation/cri-o/cri-o-1.13.5.ebuild |
29 |
deleted file mode 100644 |
30 |
index 2478498c2a7..00000000000 |
31 |
--- a/app-emulation/cri-o/cri-o-1.13.5.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,112 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-EGIT_COMMIT="a9d8dde49418572b6ea843a5d3346c966e82077f" |
40 |
-EGO_PN="github.com/kubernetes-sigs/${PN}" |
41 |
- |
42 |
-inherit golang-vcs-snapshot systemd |
43 |
- |
44 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
45 |
-HOMEPAGE="https://cri-o.io/" |
46 |
-SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
47 |
- |
48 |
-LICENSE="Apache-2.0" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~amd64" |
51 |
-IUSE="btrfs +device-mapper ostree seccomp selinux" |
52 |
- |
53 |
-COMMON_DEPEND=" |
54 |
- app-crypt/gpgme:= |
55 |
- app-emulation/runc |
56 |
- dev-libs/glib:= |
57 |
- dev-libs/libassuan:= |
58 |
- dev-libs/libgpg-error:= |
59 |
- net-firewall/conntrack-tools |
60 |
- net-firewall/iptables |
61 |
- net-misc/cni-plugins |
62 |
- net-misc/socat |
63 |
- sys-apps/iproute2 |
64 |
- btrfs? ( sys-fs/btrfs-progs ) |
65 |
- device-mapper? ( sys-fs/lvm2:= ) |
66 |
- ostree? ( dev-util/ostree ) |
67 |
- seccomp? ( sys-libs/libseccomp:= ) |
68 |
- selinux? ( sys-libs/libselinux:= )" |
69 |
-DEPEND=" |
70 |
- ${COMMON_DEPEND} |
71 |
- dev-go/go-md2man" |
72 |
-RDEPEND="${COMMON_DEPEND}" |
73 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
74 |
- |
75 |
-src_prepare() { |
76 |
- default |
77 |
- |
78 |
- sed -e '/^GIT_.*/d' \ |
79 |
- -e '/ git diff --exit-code/d' \ |
80 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
81 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
82 |
- -i Makefile || die |
83 |
- |
84 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
85 |
- |
86 |
- sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
87 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
88 |
- -i Makefile.inc || die |
89 |
- |
90 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
91 |
- -i contrib/systemd/* || die |
92 |
-} |
93 |
- |
94 |
-src_compile() { |
95 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
96 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
97 |
- hack/btrfs_installed_tag.sh || die; } |
98 |
- |
99 |
- [[ -f hack/libdm_installed.sh ]] || die |
100 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
101 |
- hack/libdm_installed.sh || die; } |
102 |
- |
103 |
- [[ -f hack/ostree_tag.sh ]] || die |
104 |
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \ |
105 |
- hack/ostree_tag.sh || die; } |
106 |
- |
107 |
- [[ -f hack/seccomp_tag.sh ]] || die |
108 |
- use seccomp || { echo -e "#!/bin/sh\ntrue" > \ |
109 |
- hack/seccomp_tag.sh || die; } |
110 |
- |
111 |
- [[ -f hack/selinux_tag.sh ]] || die |
112 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
113 |
- hack/selinux_tag.sh || die; } |
114 |
- |
115 |
- mkdir -p bin || die |
116 |
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ |
117 |
- emake binaries docs |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man |
122 |
- |
123 |
- keepdir /etc/crio |
124 |
- insinto /etc/crio |
125 |
- use seccomp && doins seccomp.json |
126 |
- |
127 |
- "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die |
128 |
- doins "${T}/crio.conf.example" |
129 |
- |
130 |
- newinitd "${FILESDIR}/crio.initd" crio |
131 |
- |
132 |
- insinto /etc/logrotate.d |
133 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
134 |
- |
135 |
- # Suppress crio log error messages triggered if these don't exist. |
136 |
- keepdir /etc/containers/oci/hooks.d |
137 |
- keepdir /usr/share/containers/oci/hooks.d |
138 |
- |
139 |
- # Suppress crio "Missing CNI default network" log message. |
140 |
- keepdir /etc/cni/net.d |
141 |
- insinto /etc/cni/net.d |
142 |
- doins contrib/cni/99-loopback.conf |
143 |
- |
144 |
- systemd_dounit contrib/systemd/* |
145 |
-} |
146 |
|
147 |
diff --git a/app-emulation/cri-o/cri-o-1.13.7.ebuild b/app-emulation/cri-o/cri-o-1.13.7.ebuild |
148 |
deleted file mode 100644 |
149 |
index a032de19c99..00000000000 |
150 |
--- a/app-emulation/cri-o/cri-o-1.13.7.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,112 +0,0 @@ |
153 |
-# Copyright 1999-2019 Gentoo Authors |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=7 |
157 |
- |
158 |
-EGIT_COMMIT="42585737f5eb59273e791e47ab1643e10862d67f" |
159 |
-EGO_PN="github.com/kubernetes-sigs/${PN}" |
160 |
- |
161 |
-inherit golang-vcs-snapshot systemd |
162 |
- |
163 |
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" |
164 |
-HOMEPAGE="https://cri-o.io/" |
165 |
-SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
166 |
- |
167 |
-LICENSE="Apache-2.0" |
168 |
-SLOT="0" |
169 |
-KEYWORDS="~amd64" |
170 |
-IUSE="btrfs +device-mapper ostree seccomp selinux" |
171 |
- |
172 |
-COMMON_DEPEND=" |
173 |
- app-crypt/gpgme:= |
174 |
- app-emulation/runc |
175 |
- dev-libs/glib:= |
176 |
- dev-libs/libassuan:= |
177 |
- dev-libs/libgpg-error:= |
178 |
- net-firewall/conntrack-tools |
179 |
- net-firewall/iptables |
180 |
- net-misc/cni-plugins |
181 |
- net-misc/socat |
182 |
- sys-apps/iproute2 |
183 |
- btrfs? ( sys-fs/btrfs-progs ) |
184 |
- device-mapper? ( sys-fs/lvm2:= ) |
185 |
- ostree? ( dev-util/ostree ) |
186 |
- seccomp? ( sys-libs/libseccomp:= ) |
187 |
- selinux? ( sys-libs/libselinux:= )" |
188 |
-DEPEND=" |
189 |
- ${COMMON_DEPEND} |
190 |
- dev-go/go-md2man" |
191 |
-RDEPEND="${COMMON_DEPEND}" |
192 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
193 |
- |
194 |
-src_prepare() { |
195 |
- default |
196 |
- |
197 |
- sed -e '/^GIT_.*/d' \ |
198 |
- -e '/ git diff --exit-code/d' \ |
199 |
- -e 's/$(GO) build -i/$(GO) build -v -work -x/' \ |
200 |
- -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ |
201 |
- -i Makefile || die |
202 |
- |
203 |
- echo ".NOTPARALLEL: binaries docs" >> Makefile || die |
204 |
- |
205 |
- sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \ |
206 |
- -e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \ |
207 |
- -i Makefile.inc || die |
208 |
- |
209 |
- sed -e 's:/usr/local/bin:/usr/bin:' \ |
210 |
- -i contrib/systemd/* || die |
211 |
-} |
212 |
- |
213 |
-src_compile() { |
214 |
- [[ -f hack/btrfs_installed_tag.sh ]] || die |
215 |
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ |
216 |
- hack/btrfs_installed_tag.sh || die; } |
217 |
- |
218 |
- [[ -f hack/libdm_installed.sh ]] || die |
219 |
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ |
220 |
- hack/libdm_installed.sh || die; } |
221 |
- |
222 |
- [[ -f hack/ostree_tag.sh ]] || die |
223 |
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \ |
224 |
- hack/ostree_tag.sh || die; } |
225 |
- |
226 |
- [[ -f hack/seccomp_tag.sh ]] || die |
227 |
- use seccomp || { echo -e "#!/bin/sh\ntrue" > \ |
228 |
- hack/seccomp_tag.sh || die; } |
229 |
- |
230 |
- [[ -f hack/selinux_tag.sh ]] || die |
231 |
- use selinux || { echo -e "#!/bin/sh\ntrue" > \ |
232 |
- hack/selinux_tag.sh || die; } |
233 |
- |
234 |
- mkdir -p bin || die |
235 |
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ |
236 |
- emake binaries docs |
237 |
-} |
238 |
- |
239 |
-src_install() { |
240 |
- emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man |
241 |
- |
242 |
- keepdir /etc/crio |
243 |
- insinto /etc/crio |
244 |
- use seccomp && doins seccomp.json |
245 |
- |
246 |
- "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die |
247 |
- doins "${T}/crio.conf.example" |
248 |
- |
249 |
- newinitd "${FILESDIR}/crio.initd" crio |
250 |
- |
251 |
- insinto /etc/logrotate.d |
252 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
253 |
- |
254 |
- # Suppress crio log error messages triggered if these don't exist. |
255 |
- keepdir /etc/containers/oci/hooks.d |
256 |
- keepdir /usr/share/containers/oci/hooks.d |
257 |
- |
258 |
- # Suppress crio "Missing CNI default network" log message. |
259 |
- keepdir /etc/cni/net.d |
260 |
- insinto /etc/cni/net.d |
261 |
- doins contrib/cni/99-loopback.conf |
262 |
- |
263 |
- systemd_dounit contrib/systemd/* |
264 |
-} |