Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/
Date: Sat, 30 Jan 2021 06:38:25
Message-Id: 1611987082.00c56a9a43f8fc858e7effadc45ab0ba19f13b0b.juippis@gentoo
1 commit: 00c56a9a43f8fc858e7effadc45ab0ba19f13b0b
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 06:11:22 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 06:11:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c56a9a
7
8 app-emulation/lxd: clean old
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 app-emulation/lxd/lxd-4.0.4-r3.ebuild | 144 --------------------------------
13 app-emulation/lxd/lxd-4.0.4-r4.ebuild | 152 ----------------------------------
14 2 files changed, 296 deletions(-)
15
16 diff --git a/app-emulation/lxd/lxd-4.0.4-r3.ebuild b/app-emulation/lxd/lxd-4.0.4-r3.ebuild
17 deleted file mode 100644
18 index 2a2aee90dd4..00000000000
19 --- a/app-emulation/lxd/lxd-4.0.4-r3.ebuild
20 +++ /dev/null
21 @@ -1,144 +0,0 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=7
26 -
27 -inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
28 -
29 -DESCRIPTION="Fast, dense and secure container management"
30 -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
31 -SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
32 - verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
33 -
34 -# Needs to include licenses for all bundled programs and libraries.
35 -LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
36 -SLOT="0"
37 -KEYWORDS="amd64"
38 -IUSE="apparmor ipv6 nls verify-sig"
39 -
40 -DEPEND="app-arch/xz-utils
41 - >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
42 - dev-libs/dqlite
43 - dev-libs/lzo
44 - dev-libs/raft
45 - net-dns/dnsmasq[dhcp,ipv6?]"
46 -RDEPEND="${DEPEND}
47 - acct-group/lxd
48 - net-firewall/ebtables
49 - net-firewall/iptables[ipv6?]
50 - sys-apps/iproute2[ipv6?]
51 - sys-fs/fuse:0=
52 - sys-fs/lxcfs
53 - sys-fs/squashfs-tools
54 - virtual/acl"
55 -BDEPEND="dev-lang/go
56 - nls? ( sys-devel/gettext )
57 - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
58 -
59 -CONFIG_CHECK="
60 - ~CGROUPS
61 - ~IPC_NS
62 - ~NET_NS
63 - ~PID_NS
64 -
65 - ~SECCOMP
66 - ~USER_NS
67 - ~UTS_NS
68 -"
69 -
70 -ERROR_IPC_NS="CONFIG_IPC_NS is required."
71 -ERROR_NET_NS="CONFIG_NET_NS is required."
72 -ERROR_PID_NS="CONFIG_PID_NS is required."
73 -ERROR_SECCOMP="CONFIG_SECCOMP is required."
74 -ERROR_UTS_NS="CONFIG_UTS_NS is required."
75 -
76 -# Go magic.
77 -QA_PREBUILT="/usr/bin/fuidshift
78 - /usr/bin/lxc
79 - /usr/bin/lxc-to-lxd
80 - /usr/bin/lxd-agent
81 - /usr/bin/lxd-benchmark
82 - /usr/bin/lxd-p2c
83 - /usr/sbin/lxd"
84 -
85 -EGO_PN="github.com/lxc/lxd"
86 -GOPATH="${S}/_dist" # this seems to reset every now and then, though
87 -
88 -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
89 -
90 -src_prepare() {
91 - default
92 -
93 - export GOPATH="${S}/_dist"
94 -
95 - sed -i \
96 - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
97 - -e "s:make:make ${MAKEOPTS}:g" \
98 - Makefile || die
99 -}
100 -
101 -src_configure() { :; }
102 -
103 -src_compile() {
104 - export GOPATH="${S}/_dist"
105 -
106 - cd "${S}" || die
107 -
108 - for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
109 - go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
110 - done
111 -
112 - go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
113 -
114 - use nls && emake build-mo
115 -}
116 -
117 -src_test() {
118 - export GOPATH="${S}/_dist"
119 - go test -v ${EGO_PN}/lxd || die
120 -}
121 -
122 -src_install() {
123 - local bindir="_dist/bin"
124 - export GOPATH="${S}/_dist"
125 -
126 - dosbin ${bindir}/lxd
127 -
128 - for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
129 - dobin ${bindir}/${l}
130 - done
131 -
132 - cd "${S}" || die
133 -
134 - newbashcomp scripts/bash/lxd-client lxc
135 -
136 - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
137 - newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
138 -
139 - if use apparmor; then
140 - systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
141 - else
142 - systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
143 - fi
144 -
145 - systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
146 - systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
147 -
148 - dodoc AUTHORS doc/*
149 - use nls && domo po/*.mo
150 -}
151 -
152 -pkg_postinst() {
153 - elog
154 - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
155 - elog "including a Quick Start."
156 - elog
157 - elog "Please run 'lxc-checkconfig' to see all optional kernel features."
158 - elog
159 - elog "Optional features:"
160 - optfeature "btrfs storage backend" sys-fs/btrfs-progs
161 - optfeature "lvm2 storage backend" sys-fs/lvm2
162 - optfeature "zfs storage backend" sys-fs/zfs
163 - elog
164 - elog "Be sure to add your local user to the lxd group."
165 -}
166
167 diff --git a/app-emulation/lxd/lxd-4.0.4-r4.ebuild b/app-emulation/lxd/lxd-4.0.4-r4.ebuild
168 deleted file mode 100644
169 index 361d00b56fa..00000000000
170 --- a/app-emulation/lxd/lxd-4.0.4-r4.ebuild
171 +++ /dev/null
172 @@ -1,152 +0,0 @@
173 -# Copyright 1999-2021 Gentoo Authors
174 -# Distributed under the terms of the GNU General Public License v2
175 -
176 -EAPI=7
177 -
178 -inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
179 -
180 -DESCRIPTION="Fast, dense and secure container management"
181 -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
182 -SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
183 - verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
184 -
185 -# Needs to include licenses for all bundled programs and libraries.
186 -LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
187 -SLOT="0"
188 -KEYWORDS="~amd64"
189 -IUSE="apparmor ipv6 nls verify-sig"
190 -
191 -DEPEND="app-arch/xz-utils
192 - >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
193 - dev-libs/dqlite
194 - dev-libs/lzo
195 - dev-libs/raft
196 - net-dns/dnsmasq[dhcp,ipv6?]"
197 -RDEPEND="${DEPEND}
198 - acct-group/lxd
199 - net-firewall/ebtables
200 - net-firewall/iptables[ipv6?]
201 - sys-apps/iproute2[ipv6?]
202 - sys-fs/fuse:0=
203 - sys-fs/lxcfs
204 - sys-fs/squashfs-tools
205 - virtual/acl"
206 -BDEPEND="dev-lang/go
207 - nls? ( sys-devel/gettext )
208 - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
209 -
210 -CONFIG_CHECK="
211 - ~CGROUPS
212 - ~IPC_NS
213 - ~NET_NS
214 - ~PID_NS
215 -
216 - ~SECCOMP
217 - ~USER_NS
218 - ~UTS_NS
219 -"
220 -
221 -ERROR_IPC_NS="CONFIG_IPC_NS is required."
222 -ERROR_NET_NS="CONFIG_NET_NS is required."
223 -ERROR_PID_NS="CONFIG_PID_NS is required."
224 -ERROR_SECCOMP="CONFIG_SECCOMP is required."
225 -ERROR_UTS_NS="CONFIG_UTS_NS is required."
226 -
227 -# Go magic.
228 -QA_PREBUILT="/usr/bin/fuidshift
229 - /usr/bin/lxc
230 - /usr/bin/lxc-to-lxd
231 - /usr/bin/lxd-agent
232 - /usr/bin/lxd-benchmark
233 - /usr/bin/lxd-p2c
234 - /usr/sbin/lxd"
235 -
236 -EGO_PN="github.com/lxc/lxd"
237 -GOPATH="${S}/_dist" # this seems to reset every now and then, though
238 -
239 -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
240 -
241 -src_prepare() {
242 - default
243 -
244 - export GOPATH="${S}/_dist"
245 -
246 - sed -i \
247 - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
248 - -e "s:make:make ${MAKEOPTS}:g" \
249 - Makefile || die
250 -
251 - # Fix hardcoded ovmf file path, see bug 763180
252 - sed -i \
253 - -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
254 - -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
255 - doc/environment.md \
256 - lxd/apparmor/instance_qemu.go \
257 - lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
258 -}
259 -
260 -src_configure() { :; }
261 -
262 -src_compile() {
263 - export GOPATH="${S}/_dist"
264 -
265 - cd "${S}" || die
266 -
267 - for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
268 - go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
269 - done
270 -
271 - go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
272 -
273 - use nls && emake build-mo
274 -}
275 -
276 -src_test() {
277 - export GOPATH="${S}/_dist"
278 - go test -v ${EGO_PN}/lxd || die
279 -}
280 -
281 -src_install() {
282 - local bindir="_dist/bin"
283 - export GOPATH="${S}/_dist"
284 -
285 - dosbin ${bindir}/lxd
286 -
287 - for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
288 - dobin ${bindir}/${l}
289 - done
290 -
291 - cd "${S}" || die
292 -
293 - newbashcomp scripts/bash/lxd-client lxc
294 -
295 - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
296 - newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
297 -
298 - if use apparmor; then
299 - systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
300 - else
301 - systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
302 - fi
303 -
304 - systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
305 - systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
306 -
307 - dodoc AUTHORS doc/*
308 - use nls && domo po/*.mo
309 -}
310 -
311 -pkg_postinst() {
312 - elog
313 - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
314 - elog "including a Quick Start."
315 - elog
316 - elog "Please run 'lxc-checkconfig' to see all optional kernel features."
317 - elog
318 - elog "Optional features:"
319 - optfeature "btrfs storage backend" sys-fs/btrfs-progs
320 - optfeature "lvm2 storage backend" sys-fs/lvm2
321 - optfeature "zfs storage backend" sys-fs/zfs
322 - elog
323 - elog "Be sure to add your local user to the lxd group."
324 -}