1 |
commit: 0b96e191ff8364e293d3bb7207843c45a7f868d4 |
2 |
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 2 04:00:06 2019 +0000 |
4 |
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 2 04:00:06 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b96e191 |
7 |
|
8 |
app-emulation/lxd: Remove old |
9 |
|
10 |
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
|
13 |
app-emulation/lxd/Manifest | 3 - |
14 |
app-emulation/lxd/lxd-3.7.ebuild | 238 -------------------------------------- |
15 |
app-emulation/lxd/lxd-3.8.ebuild | 241 --------------------------------------- |
16 |
app-emulation/lxd/lxd-3.9.ebuild | 241 --------------------------------------- |
17 |
4 files changed, 723 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest |
20 |
index 65e12c849b0..f2ee48a0546 100644 |
21 |
--- a/app-emulation/lxd/Manifest |
22 |
+++ b/app-emulation/lxd/Manifest |
23 |
@@ -1,4 +1 @@ |
24 |
DIST lxd-3.10.tar.gz 27057432 BLAKE2B b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b SHA512 25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04 |
25 |
-DIST lxd-3.7.tar.gz 26321652 BLAKE2B ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc SHA512 a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb |
26 |
-DIST lxd-3.8.tar.gz 26914475 BLAKE2B 9cf7ee1b5d57a3588d3ccecd47b22ef28da0faa684de03c7273949be1902f77ff7c49f4e7e5c942f7266e4e462ee009b1e70d25362610050cc41d81029d42d7b SHA512 20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c |
27 |
-DIST lxd-3.9.tar.gz 27031818 BLAKE2B 7956aa9d0cf773fbdae64e8770ebee474d0b1e20aa1399d96eb317efb8a8e1cc1673bf345cea7a7cf99746905b9e16c6b2b507e571931a0cab37ff7ff5df67fd SHA512 8d61912adeb33d06e4065aab7eaf80ab7b6e9cbc2b20dcca1cc5c74b999838aec32e805af3a6ae1262948514a619f4332ec44912ca720fa1b0e8b962165c117a |
28 |
|
29 |
diff --git a/app-emulation/lxd/lxd-3.7.ebuild b/app-emulation/lxd/lxd-3.7.ebuild |
30 |
deleted file mode 100644 |
31 |
index 7f3ceabdddf..00000000000 |
32 |
--- a/app-emulation/lxd/lxd-3.7.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,238 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-DESCRIPTION="Fast, dense and secure container management" |
41 |
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" |
42 |
- |
43 |
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" |
44 |
-SLOT="0" |
45 |
-KEYWORDS="amd64" |
46 |
- |
47 |
-IUSE="+daemon +ipv6 +dnsmasq nls test tools" |
48 |
- |
49 |
-inherit autotools bash-completion-r1 linux-info systemd user |
50 |
- |
51 |
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" |
52 |
- |
53 |
-DEPEND=" |
54 |
- dev-lang/tcl |
55 |
- >=dev-lang/go-1.9.4 |
56 |
- dev-libs/libuv |
57 |
- dev-libs/protobuf |
58 |
- nls? ( sys-devel/gettext ) |
59 |
- test? ( |
60 |
- app-misc/jq |
61 |
- net-misc/curl |
62 |
- sys-devel/gettext |
63 |
- ) |
64 |
-" |
65 |
- |
66 |
-RDEPEND=" |
67 |
- daemon? ( |
68 |
- app-arch/xz-utils |
69 |
- >=app-emulation/lxc-2.0.7[seccomp] |
70 |
- dev-libs/libuv |
71 |
- dev-libs/lzo |
72 |
- dev-util/xdelta:3 |
73 |
- dnsmasq? ( |
74 |
- net-dns/dnsmasq[dhcp,ipv6?] |
75 |
- ) |
76 |
- net-firewall/ebtables |
77 |
- net-firewall/iptables[ipv6?] |
78 |
- net-libs/libnfnetlink |
79 |
- net-misc/rsync[xattr] |
80 |
- sys-apps/iproute2[ipv6?] |
81 |
- sys-fs/fuse |
82 |
- sys-fs/lxcfs |
83 |
- sys-fs/squashfs-tools |
84 |
- virtual/acl |
85 |
- ) |
86 |
-" |
87 |
- |
88 |
-CONFIG_CHECK=" |
89 |
- ~BRIDGE |
90 |
- ~DUMMY |
91 |
- ~IP6_NF_NAT |
92 |
- ~IP6_NF_TARGET_MASQUERADE |
93 |
- ~IPV6 |
94 |
- ~IP_NF_NAT |
95 |
- ~IP_NF_TARGET_MASQUERADE |
96 |
- ~MACVLAN |
97 |
- ~NETFILTER_XT_MATCH_COMMENT |
98 |
- ~NET_IPGRE |
99 |
- ~NET_IPGRE_DEMUX |
100 |
- ~NET_IPIP |
101 |
- ~NF_NAT_MASQUERADE_IPV4 |
102 |
- ~NF_NAT_MASQUERADE_IPV6 |
103 |
- ~VXLAN |
104 |
-" |
105 |
- |
106 |
-ERROR_BRIDGE="BRIDGE: needed for network commands" |
107 |
-ERROR_DUMMY="DUMMY: needed for network commands" |
108 |
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" |
109 |
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" |
110 |
-ERROR_IPV6="IPV6: needed for network commands" |
111 |
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" |
112 |
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" |
113 |
-ERROR_MACVLAN="MACVLAN: needed for network commands" |
114 |
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" |
115 |
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" |
116 |
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" |
117 |
-ERROR_NET_IPIP="NET_IPIP: needed for network commands" |
118 |
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" |
119 |
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" |
120 |
-ERROR_VXLAN="VXLAN: needed for network commands" |
121 |
- |
122 |
-EGO_PN="github.com/lxc/lxd" |
123 |
- |
124 |
-src_prepare() { |
125 |
- eapply_user |
126 |
- eapply "${FILESDIR}/de-translation-newline-1.patch" |
127 |
- eapply "${FILESDIR}/ptbr-translation-newline.patch" |
128 |
- |
129 |
- cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir" |
130 |
- eautoreconf |
131 |
-} |
132 |
- |
133 |
-src_configure() { |
134 |
- export GOPATH="${S}/dist" |
135 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
136 |
- econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd" |
137 |
- |
138 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
139 |
- PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd |
140 |
-} |
141 |
- |
142 |
-src_compile() { |
143 |
- export GOPATH="${S}/dist" |
144 |
- |
145 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
146 |
- emake |
147 |
- |
148 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
149 |
- emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite" |
150 |
- |
151 |
- # We don't use the Makefile here because it builds targets with the |
152 |
- # assumption that `pwd` is in a deep gopath namespace, which we're not. |
153 |
- # It's simpler to manually call "go install" than patching the Makefile. |
154 |
- cd "${S}" |
155 |
- go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" |
156 |
- |
157 |
- if use daemon; then |
158 |
- |
159 |
- # LXD depends on a patched, bundled sqlite with replication |
160 |
- # capabilities. |
161 |
- export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/" |
162 |
- export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" |
163 |
- export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/" |
164 |
- |
165 |
- go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" |
166 |
- fi |
167 |
- |
168 |
- if use tools; then |
169 |
- go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" |
170 |
- go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd" |
171 |
- go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark" |
172 |
- fi |
173 |
- |
174 |
- use nls && emake build-mo |
175 |
-} |
176 |
- |
177 |
-src_test() { |
178 |
- if use daemon; then |
179 |
- export GOPATH="${S}/dist" |
180 |
- # This is mostly a copy/paste from the Makefile's "check" rule, but |
181 |
- # patching the Makefile to work in a non "fully-qualified" go namespace |
182 |
- # was more complicated than this modest copy/paste. |
183 |
- # Also: sorry, for now a network connection is needed to run tests. |
184 |
- # Will properly bundle test dependencies later. |
185 |
- go get -v -x github.com/rogpeppe/godeps |
186 |
- go get -v -x github.com/remyoudompheng/go-misc/deadcode |
187 |
- go get -v -x github.com/golang/lint/golint |
188 |
- go test -v ${EGO_PN}/lxd |
189 |
- else |
190 |
- einfo "No tests to run for client-only builds" |
191 |
- fi |
192 |
-} |
193 |
- |
194 |
-src_install() { |
195 |
- local bindir="dist/bin" |
196 |
- dobin ${bindir}/lxc |
197 |
- if use daemon; then |
198 |
- |
199 |
- export GOPATH="${S}/dist" |
200 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
201 |
- emake DESTDIR="${D}" install |
202 |
- |
203 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
204 |
- emake DESTDIR="${D}" install |
205 |
- |
206 |
- # Must only install libs |
207 |
- rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary" |
208 |
- rm -r "${D}/usr/include" || die "Can't remove include directory" |
209 |
- |
210 |
- cd "${S}" || die "Can't cd to \${S}" |
211 |
- dosbin ${bindir}/lxd |
212 |
- fi |
213 |
- |
214 |
- if use tools; then |
215 |
- dobin ${bindir}/fuidshift |
216 |
- dobin ${bindir}/lxc-to-lxd |
217 |
- dobin ${bindir}/lxd-benchmark |
218 |
- fi |
219 |
- |
220 |
- if use nls; then |
221 |
- domo po/*.mo |
222 |
- fi |
223 |
- |
224 |
- if use daemon; then |
225 |
- newinitd "${FILESDIR}"/${PN}.initd lxd |
226 |
- newconfd "${FILESDIR}"/${PN}.confd lxd |
227 |
- |
228 |
- systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service |
229 |
- fi |
230 |
- |
231 |
- newbashcomp scripts/bash/lxd-client lxc |
232 |
- |
233 |
- dodoc AUTHORS doc/* |
234 |
-} |
235 |
- |
236 |
-pkg_postinst() { |
237 |
- elog |
238 |
- elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," |
239 |
- elog "including a Quick Start." |
240 |
- |
241 |
- # The messaging below only applies to daemon installs |
242 |
- use daemon || return 0 |
243 |
- |
244 |
- # The control socket will be owned by (and writeable by) this group. |
245 |
- enewgroup lxd |
246 |
- |
247 |
- # Ubuntu also defines an lxd user but it appears unused (the daemon |
248 |
- # must run as root) |
249 |
- |
250 |
- elog |
251 |
- elog "Though not strictly required, some features are enabled at run-time" |
252 |
- elog "when the relevant helper programs are detected:" |
253 |
- elog "- sys-apps/apparmor" |
254 |
- elog "- sys-fs/btrfs-progs" |
255 |
- elog "- sys-fs/lvm2" |
256 |
- elog "- sys-fs/zfs" |
257 |
- elog "- sys-process/criu" |
258 |
- elog |
259 |
- elog "Since these features can't be disabled at build-time they are" |
260 |
- elog "not USE-conditional." |
261 |
- elog |
262 |
- elog "Be sure to add your local user to the lxd group." |
263 |
- elog |
264 |
- elog "Networks with bridge.mode=fan are unsupported due to requiring" |
265 |
- elog "a patched kernel and iproute2." |
266 |
-} |
267 |
- |
268 |
-# TODO: |
269 |
-# - man page, I don't see cobra generating it |
270 |
-# - maybe implement LXD_CLUSTER_UPDATE per |
271 |
-# https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656 |
272 |
-# EM I'm not convinced it's a good design. |
273 |
|
274 |
diff --git a/app-emulation/lxd/lxd-3.8.ebuild b/app-emulation/lxd/lxd-3.8.ebuild |
275 |
deleted file mode 100644 |
276 |
index 886ba7e161b..00000000000 |
277 |
--- a/app-emulation/lxd/lxd-3.8.ebuild |
278 |
+++ /dev/null |
279 |
@@ -1,241 +0,0 @@ |
280 |
-# Copyright 1999-2019 Gentoo Authors |
281 |
-# Distributed under the terms of the GNU General Public License v2 |
282 |
- |
283 |
-EAPI=6 |
284 |
- |
285 |
-DESCRIPTION="Fast, dense and secure container management" |
286 |
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" |
287 |
- |
288 |
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" |
289 |
-SLOT="0" |
290 |
-KEYWORDS="amd64" |
291 |
- |
292 |
-IUSE="+daemon +ipv6 +dnsmasq nls test tools" |
293 |
- |
294 |
-inherit autotools bash-completion-r1 linux-info systemd user |
295 |
- |
296 |
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" |
297 |
- |
298 |
-DEPEND=" |
299 |
- dev-lang/tcl |
300 |
- >=dev-lang/go-1.9.4 |
301 |
- dev-libs/libuv |
302 |
- dev-libs/protobuf |
303 |
- nls? ( sys-devel/gettext ) |
304 |
- test? ( |
305 |
- app-misc/jq |
306 |
- net-misc/curl |
307 |
- sys-devel/gettext |
308 |
- ) |
309 |
-" |
310 |
- |
311 |
-RDEPEND=" |
312 |
- daemon? ( |
313 |
- app-arch/xz-utils |
314 |
- >=app-emulation/lxc-2.0.7[seccomp] |
315 |
- dev-libs/libuv |
316 |
- dev-libs/lzo |
317 |
- dev-util/xdelta:3 |
318 |
- dnsmasq? ( |
319 |
- net-dns/dnsmasq[dhcp,ipv6?] |
320 |
- ) |
321 |
- net-firewall/ebtables |
322 |
- net-firewall/iptables[ipv6?] |
323 |
- net-libs/libnfnetlink |
324 |
- net-libs/libnsl:0= |
325 |
- net-misc/rsync[xattr] |
326 |
- sys-apps/iproute2[ipv6?] |
327 |
- sys-fs/fuse |
328 |
- sys-fs/lxcfs |
329 |
- sys-fs/squashfs-tools |
330 |
- virtual/acl |
331 |
- ) |
332 |
-" |
333 |
- |
334 |
-CONFIG_CHECK=" |
335 |
- ~BRIDGE |
336 |
- ~DUMMY |
337 |
- ~IP6_NF_NAT |
338 |
- ~IP6_NF_TARGET_MASQUERADE |
339 |
- ~IPV6 |
340 |
- ~IP_NF_NAT |
341 |
- ~IP_NF_TARGET_MASQUERADE |
342 |
- ~MACVLAN |
343 |
- ~NETFILTER_XT_MATCH_COMMENT |
344 |
- ~NET_IPGRE |
345 |
- ~NET_IPGRE_DEMUX |
346 |
- ~NET_IPIP |
347 |
- ~NF_NAT_MASQUERADE_IPV4 |
348 |
- ~NF_NAT_MASQUERADE_IPV6 |
349 |
- ~VXLAN |
350 |
-" |
351 |
- |
352 |
-ERROR_BRIDGE="BRIDGE: needed for network commands" |
353 |
-ERROR_DUMMY="DUMMY: needed for network commands" |
354 |
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" |
355 |
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" |
356 |
-ERROR_IPV6="IPV6: needed for network commands" |
357 |
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" |
358 |
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" |
359 |
-ERROR_MACVLAN="MACVLAN: needed for network commands" |
360 |
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" |
361 |
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" |
362 |
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" |
363 |
-ERROR_NET_IPIP="NET_IPIP: needed for network commands" |
364 |
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" |
365 |
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" |
366 |
-ERROR_VXLAN="VXLAN: needed for network commands" |
367 |
- |
368 |
-EGO_PN="github.com/lxc/lxd" |
369 |
- |
370 |
-src_prepare() { |
371 |
- eapply_user |
372 |
- eapply "${FILESDIR}/de-translation-newline-1.patch" |
373 |
- eapply "${FILESDIR}/ptbr-translation-newline.patch" |
374 |
- |
375 |
- cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir" |
376 |
- eautoreconf |
377 |
-} |
378 |
- |
379 |
-src_configure() { |
380 |
- export GOPATH="${S}/dist" |
381 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
382 |
- econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd" |
383 |
- |
384 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
385 |
- PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd |
386 |
-} |
387 |
- |
388 |
-src_compile() { |
389 |
- export GOPATH="${S}/dist" |
390 |
- |
391 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
392 |
- emake |
393 |
- |
394 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
395 |
- emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite" |
396 |
- |
397 |
- # We don't use the Makefile here because it builds targets with the |
398 |
- # assumption that `pwd` is in a deep gopath namespace, which we're not. |
399 |
- # It's simpler to manually call "go install" than patching the Makefile. |
400 |
- cd "${S}" |
401 |
- go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" |
402 |
- |
403 |
- if use daemon; then |
404 |
- |
405 |
- # LXD depends on a patched, bundled sqlite with replication |
406 |
- # capabilities. |
407 |
- export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/" |
408 |
- export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" |
409 |
- export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/" |
410 |
- |
411 |
- go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" |
412 |
- fi |
413 |
- |
414 |
- if use tools; then |
415 |
- go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" |
416 |
- go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd" |
417 |
- go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark" |
418 |
- go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c" |
419 |
- fi |
420 |
- |
421 |
- use nls && emake build-mo |
422 |
-} |
423 |
- |
424 |
-src_test() { |
425 |
- if use daemon; then |
426 |
- export GOPATH="${S}/dist" |
427 |
- # This is mostly a copy/paste from the Makefile's "check" rule, but |
428 |
- # patching the Makefile to work in a non "fully-qualified" go namespace |
429 |
- # was more complicated than this modest copy/paste. |
430 |
- # Also: sorry, for now a network connection is needed to run tests. |
431 |
- # Will properly bundle test dependencies later. |
432 |
- go get -v -x github.com/rogpeppe/godeps |
433 |
- go get -v -x github.com/remyoudompheng/go-misc/deadcode |
434 |
- go get -v -x github.com/golang/lint/golint |
435 |
- go test -v ${EGO_PN}/lxd |
436 |
- else |
437 |
- einfo "No tests to run for client-only builds" |
438 |
- fi |
439 |
-} |
440 |
- |
441 |
-src_install() { |
442 |
- local bindir="dist/bin" |
443 |
- dobin ${bindir}/lxc |
444 |
- if use daemon; then |
445 |
- |
446 |
- export GOPATH="${S}/dist" |
447 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
448 |
- emake DESTDIR="${D}" install |
449 |
- |
450 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
451 |
- emake DESTDIR="${D}" install |
452 |
- |
453 |
- # Must only install libs |
454 |
- rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary" |
455 |
- rm -r "${D}/usr/include" || die "Can't remove include directory" |
456 |
- |
457 |
- cd "${S}" || die "Can't cd to \${S}" |
458 |
- dosbin ${bindir}/lxd |
459 |
- fi |
460 |
- |
461 |
- if use tools; then |
462 |
- dobin ${bindir}/fuidshift |
463 |
- dobin ${bindir}/lxc-to-lxd |
464 |
- dobin ${bindir}/lxd-benchmark |
465 |
- dobin ${bindir}/lxd-p2c |
466 |
- fi |
467 |
- |
468 |
- if use nls; then |
469 |
- domo po/*.mo |
470 |
- fi |
471 |
- |
472 |
- if use daemon; then |
473 |
- newinitd "${FILESDIR}"/${PN}.initd lxd |
474 |
- newconfd "${FILESDIR}"/${PN}.confd lxd |
475 |
- |
476 |
- systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service |
477 |
- fi |
478 |
- |
479 |
- newbashcomp scripts/bash/lxd-client lxc |
480 |
- |
481 |
- dodoc AUTHORS doc/* |
482 |
-} |
483 |
- |
484 |
-pkg_postinst() { |
485 |
- elog |
486 |
- elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," |
487 |
- elog "including a Quick Start." |
488 |
- |
489 |
- # The messaging below only applies to daemon installs |
490 |
- use daemon || return 0 |
491 |
- |
492 |
- # The control socket will be owned by (and writeable by) this group. |
493 |
- enewgroup lxd |
494 |
- |
495 |
- # Ubuntu also defines an lxd user but it appears unused (the daemon |
496 |
- # must run as root) |
497 |
- |
498 |
- elog |
499 |
- elog "Though not strictly required, some features are enabled at run-time" |
500 |
- elog "when the relevant helper programs are detected:" |
501 |
- elog "- sys-apps/apparmor" |
502 |
- elog "- sys-fs/btrfs-progs" |
503 |
- elog "- sys-fs/lvm2" |
504 |
- elog "- sys-fs/zfs" |
505 |
- elog "- sys-process/criu" |
506 |
- elog |
507 |
- elog "Since these features can't be disabled at build-time they are" |
508 |
- elog "not USE-conditional." |
509 |
- elog |
510 |
- elog "Be sure to add your local user to the lxd group." |
511 |
- elog |
512 |
- elog "Networks with bridge.mode=fan are unsupported due to requiring" |
513 |
- elog "a patched kernel and iproute2." |
514 |
-} |
515 |
- |
516 |
-# TODO: |
517 |
-# - man page, I don't see cobra generating it |
518 |
-# - maybe implement LXD_CLUSTER_UPDATE per |
519 |
-# https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656 |
520 |
-# EM I'm not convinced it's a good design. |
521 |
|
522 |
diff --git a/app-emulation/lxd/lxd-3.9.ebuild b/app-emulation/lxd/lxd-3.9.ebuild |
523 |
deleted file mode 100644 |
524 |
index 886ba7e161b..00000000000 |
525 |
--- a/app-emulation/lxd/lxd-3.9.ebuild |
526 |
+++ /dev/null |
527 |
@@ -1,241 +0,0 @@ |
528 |
-# Copyright 1999-2019 Gentoo Authors |
529 |
-# Distributed under the terms of the GNU General Public License v2 |
530 |
- |
531 |
-EAPI=6 |
532 |
- |
533 |
-DESCRIPTION="Fast, dense and secure container management" |
534 |
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" |
535 |
- |
536 |
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" |
537 |
-SLOT="0" |
538 |
-KEYWORDS="amd64" |
539 |
- |
540 |
-IUSE="+daemon +ipv6 +dnsmasq nls test tools" |
541 |
- |
542 |
-inherit autotools bash-completion-r1 linux-info systemd user |
543 |
- |
544 |
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" |
545 |
- |
546 |
-DEPEND=" |
547 |
- dev-lang/tcl |
548 |
- >=dev-lang/go-1.9.4 |
549 |
- dev-libs/libuv |
550 |
- dev-libs/protobuf |
551 |
- nls? ( sys-devel/gettext ) |
552 |
- test? ( |
553 |
- app-misc/jq |
554 |
- net-misc/curl |
555 |
- sys-devel/gettext |
556 |
- ) |
557 |
-" |
558 |
- |
559 |
-RDEPEND=" |
560 |
- daemon? ( |
561 |
- app-arch/xz-utils |
562 |
- >=app-emulation/lxc-2.0.7[seccomp] |
563 |
- dev-libs/libuv |
564 |
- dev-libs/lzo |
565 |
- dev-util/xdelta:3 |
566 |
- dnsmasq? ( |
567 |
- net-dns/dnsmasq[dhcp,ipv6?] |
568 |
- ) |
569 |
- net-firewall/ebtables |
570 |
- net-firewall/iptables[ipv6?] |
571 |
- net-libs/libnfnetlink |
572 |
- net-libs/libnsl:0= |
573 |
- net-misc/rsync[xattr] |
574 |
- sys-apps/iproute2[ipv6?] |
575 |
- sys-fs/fuse |
576 |
- sys-fs/lxcfs |
577 |
- sys-fs/squashfs-tools |
578 |
- virtual/acl |
579 |
- ) |
580 |
-" |
581 |
- |
582 |
-CONFIG_CHECK=" |
583 |
- ~BRIDGE |
584 |
- ~DUMMY |
585 |
- ~IP6_NF_NAT |
586 |
- ~IP6_NF_TARGET_MASQUERADE |
587 |
- ~IPV6 |
588 |
- ~IP_NF_NAT |
589 |
- ~IP_NF_TARGET_MASQUERADE |
590 |
- ~MACVLAN |
591 |
- ~NETFILTER_XT_MATCH_COMMENT |
592 |
- ~NET_IPGRE |
593 |
- ~NET_IPGRE_DEMUX |
594 |
- ~NET_IPIP |
595 |
- ~NF_NAT_MASQUERADE_IPV4 |
596 |
- ~NF_NAT_MASQUERADE_IPV6 |
597 |
- ~VXLAN |
598 |
-" |
599 |
- |
600 |
-ERROR_BRIDGE="BRIDGE: needed for network commands" |
601 |
-ERROR_DUMMY="DUMMY: needed for network commands" |
602 |
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" |
603 |
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" |
604 |
-ERROR_IPV6="IPV6: needed for network commands" |
605 |
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" |
606 |
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" |
607 |
-ERROR_MACVLAN="MACVLAN: needed for network commands" |
608 |
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" |
609 |
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" |
610 |
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" |
611 |
-ERROR_NET_IPIP="NET_IPIP: needed for network commands" |
612 |
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" |
613 |
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" |
614 |
-ERROR_VXLAN="VXLAN: needed for network commands" |
615 |
- |
616 |
-EGO_PN="github.com/lxc/lxd" |
617 |
- |
618 |
-src_prepare() { |
619 |
- eapply_user |
620 |
- eapply "${FILESDIR}/de-translation-newline-1.patch" |
621 |
- eapply "${FILESDIR}/ptbr-translation-newline.patch" |
622 |
- |
623 |
- cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir" |
624 |
- eautoreconf |
625 |
-} |
626 |
- |
627 |
-src_configure() { |
628 |
- export GOPATH="${S}/dist" |
629 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
630 |
- econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd" |
631 |
- |
632 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
633 |
- PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd |
634 |
-} |
635 |
- |
636 |
-src_compile() { |
637 |
- export GOPATH="${S}/dist" |
638 |
- |
639 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
640 |
- emake |
641 |
- |
642 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
643 |
- emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite" |
644 |
- |
645 |
- # We don't use the Makefile here because it builds targets with the |
646 |
- # assumption that `pwd` is in a deep gopath namespace, which we're not. |
647 |
- # It's simpler to manually call "go install" than patching the Makefile. |
648 |
- cd "${S}" |
649 |
- go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" |
650 |
- |
651 |
- if use daemon; then |
652 |
- |
653 |
- # LXD depends on a patched, bundled sqlite with replication |
654 |
- # capabilities. |
655 |
- export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/" |
656 |
- export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" |
657 |
- export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/" |
658 |
- |
659 |
- go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" |
660 |
- fi |
661 |
- |
662 |
- if use tools; then |
663 |
- go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" |
664 |
- go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd" |
665 |
- go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark" |
666 |
- go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c" |
667 |
- fi |
668 |
- |
669 |
- use nls && emake build-mo |
670 |
-} |
671 |
- |
672 |
-src_test() { |
673 |
- if use daemon; then |
674 |
- export GOPATH="${S}/dist" |
675 |
- # This is mostly a copy/paste from the Makefile's "check" rule, but |
676 |
- # patching the Makefile to work in a non "fully-qualified" go namespace |
677 |
- # was more complicated than this modest copy/paste. |
678 |
- # Also: sorry, for now a network connection is needed to run tests. |
679 |
- # Will properly bundle test dependencies later. |
680 |
- go get -v -x github.com/rogpeppe/godeps |
681 |
- go get -v -x github.com/remyoudompheng/go-misc/deadcode |
682 |
- go get -v -x github.com/golang/lint/golint |
683 |
- go test -v ${EGO_PN}/lxd |
684 |
- else |
685 |
- einfo "No tests to run for client-only builds" |
686 |
- fi |
687 |
-} |
688 |
- |
689 |
-src_install() { |
690 |
- local bindir="dist/bin" |
691 |
- dobin ${bindir}/lxc |
692 |
- if use daemon; then |
693 |
- |
694 |
- export GOPATH="${S}/dist" |
695 |
- cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" |
696 |
- emake DESTDIR="${D}" install |
697 |
- |
698 |
- cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" |
699 |
- emake DESTDIR="${D}" install |
700 |
- |
701 |
- # Must only install libs |
702 |
- rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary" |
703 |
- rm -r "${D}/usr/include" || die "Can't remove include directory" |
704 |
- |
705 |
- cd "${S}" || die "Can't cd to \${S}" |
706 |
- dosbin ${bindir}/lxd |
707 |
- fi |
708 |
- |
709 |
- if use tools; then |
710 |
- dobin ${bindir}/fuidshift |
711 |
- dobin ${bindir}/lxc-to-lxd |
712 |
- dobin ${bindir}/lxd-benchmark |
713 |
- dobin ${bindir}/lxd-p2c |
714 |
- fi |
715 |
- |
716 |
- if use nls; then |
717 |
- domo po/*.mo |
718 |
- fi |
719 |
- |
720 |
- if use daemon; then |
721 |
- newinitd "${FILESDIR}"/${PN}.initd lxd |
722 |
- newconfd "${FILESDIR}"/${PN}.confd lxd |
723 |
- |
724 |
- systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service |
725 |
- fi |
726 |
- |
727 |
- newbashcomp scripts/bash/lxd-client lxc |
728 |
- |
729 |
- dodoc AUTHORS doc/* |
730 |
-} |
731 |
- |
732 |
-pkg_postinst() { |
733 |
- elog |
734 |
- elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," |
735 |
- elog "including a Quick Start." |
736 |
- |
737 |
- # The messaging below only applies to daemon installs |
738 |
- use daemon || return 0 |
739 |
- |
740 |
- # The control socket will be owned by (and writeable by) this group. |
741 |
- enewgroup lxd |
742 |
- |
743 |
- # Ubuntu also defines an lxd user but it appears unused (the daemon |
744 |
- # must run as root) |
745 |
- |
746 |
- elog |
747 |
- elog "Though not strictly required, some features are enabled at run-time" |
748 |
- elog "when the relevant helper programs are detected:" |
749 |
- elog "- sys-apps/apparmor" |
750 |
- elog "- sys-fs/btrfs-progs" |
751 |
- elog "- sys-fs/lvm2" |
752 |
- elog "- sys-fs/zfs" |
753 |
- elog "- sys-process/criu" |
754 |
- elog |
755 |
- elog "Since these features can't be disabled at build-time they are" |
756 |
- elog "not USE-conditional." |
757 |
- elog |
758 |
- elog "Be sure to add your local user to the lxd group." |
759 |
- elog |
760 |
- elog "Networks with bridge.mode=fan are unsupported due to requiring" |
761 |
- elog "a patched kernel and iproute2." |
762 |
-} |
763 |
- |
764 |
-# TODO: |
765 |
-# - man page, I don't see cobra generating it |
766 |
-# - maybe implement LXD_CLUSTER_UPDATE per |
767 |
-# https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656 |
768 |
-# EM I'm not convinced it's a good design. |