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: Wed, 25 Aug 2021 07:09:11
Message-Id: 1629875340.71c9ed27960f772a00cc542cdce1475daa461536.juippis@gentoo
1 commit: 71c9ed27960f772a00cc542cdce1475daa461536
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 25 07:08:41 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 25 07:09:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c9ed27
7
8 app-emulation/lxd: drop 4.0.6-r1
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 app-emulation/lxd/Manifest | 2 -
13 app-emulation/lxd/lxd-4.0.6-r1.ebuild | 162 ----------------------------------
14 2 files changed, 164 deletions(-)
15
16 diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
17 index 6252615f397..9f5501c4228 100644
18 --- a/app-emulation/lxd/Manifest
19 +++ b/app-emulation/lxd/Manifest
20 @@ -1,4 +1,2 @@
21 -DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12 SHA512 58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
22 -DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a SHA512 6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
23 DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
24 DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
25
26 diff --git a/app-emulation/lxd/lxd-4.0.6-r1.ebuild b/app-emulation/lxd/lxd-4.0.6-r1.ebuild
27 deleted file mode 100644
28 index 1a59fbf708c..00000000000
29 --- a/app-emulation/lxd/lxd-4.0.6-r1.ebuild
30 +++ /dev/null
31 @@ -1,162 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
38 -
39 -DESCRIPTION="Fast, dense and secure container management"
40 -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
41 -SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
42 - verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
43 -
44 -LICENSE="Apache-2.0"
45 -SLOT="0"
46 -KEYWORDS="amd64"
47 -IUSE="apparmor ipv6 nls verify-sig"
48 -
49 -DEPEND="app-arch/xz-utils
50 - >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
51 - dev-libs/dqlite
52 - dev-libs/lzo
53 - dev-libs/raft
54 - >=dev-util/xdelta-3.0[lzma(+)]
55 - net-dns/dnsmasq[dhcp,ipv6?]"
56 -RDEPEND="${DEPEND}
57 - acct-group/lxd
58 - net-firewall/ebtables
59 - net-firewall/iptables[ipv6?]
60 - sys-apps/iproute2[ipv6?]
61 - sys-fs/fuse:*
62 - sys-fs/lxcfs
63 - sys-fs/squashfs-tools[lzma]
64 - virtual/acl"
65 -BDEPEND="dev-lang/go
66 - nls? ( sys-devel/gettext )
67 - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
68 -
69 -CONFIG_CHECK="
70 - ~CGROUPS
71 - ~IPC_NS
72 - ~NET_NS
73 - ~PID_NS
74 -
75 - ~SECCOMP
76 - ~USER_NS
77 - ~UTS_NS
78 -"
79 -
80 -ERROR_IPC_NS="CONFIG_IPC_NS is required."
81 -ERROR_NET_NS="CONFIG_NET_NS is required."
82 -ERROR_PID_NS="CONFIG_PID_NS is required."
83 -ERROR_SECCOMP="CONFIG_SECCOMP is required."
84 -ERROR_UTS_NS="CONFIG_UTS_NS is required."
85 -
86 -# Go magic.
87 -QA_PREBUILT="/usr/bin/fuidshift
88 - /usr/bin/lxc
89 - /usr/bin/lxc-to-lxd
90 - /usr/bin/lxd-agent
91 - /usr/bin/lxd-benchmark
92 - /usr/bin/lxd-p2c
93 - /usr/sbin/lxd"
94 -
95 -EGO_PN="github.com/lxc/lxd"
96 -GOPATH="${S}/_dist" # this seems to reset every now and then, though
97 -
98 -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
99 -
100 -src_prepare() {
101 - default
102 -
103 - export GOPATH="${S}/_dist"
104 -
105 - sed -i \
106 - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
107 - -e "s:make:make ${MAKEOPTS}:g" \
108 - Makefile || die
109 -
110 - # Fix hardcoded ovmf file path, see bug 763180
111 - sed -i \
112 - -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
113 - -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
114 - doc/environment.md \
115 - lxd/apparmor/instance_qemu.go \
116 - lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
117 -
118 - # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
119 - sed -i \
120 - -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
121 - lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
122 -}
123 -
124 -src_configure() { :; }
125 -
126 -src_compile() {
127 - export GOPATH="${S}/_dist"
128 - export GO111MODULE=auto
129 -
130 - cd "${S}" || die
131 -
132 - for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
133 - go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
134 - done
135 -
136 - go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
137 -
138 - # Needs to be built statically
139 - CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
140 - CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
141 -
142 - use nls && emake build-mo
143 -}
144 -
145 -src_test() {
146 - export GO111MODULE=auto
147 - export GOPATH="${S}/_dist"
148 - go test -v ${EGO_PN}/lxd || die
149 -}
150 -
151 -src_install() {
152 - local bindir="_dist/bin"
153 - export GOPATH="${S}/_dist"
154 -
155 - dosbin ${bindir}/lxd
156 -
157 - for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
158 - dobin ${bindir}/${l}
159 - done
160 -
161 - cd "${S}" || die
162 -
163 - newbashcomp scripts/bash/lxd-client lxc
164 -
165 - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
166 - newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
167 -
168 - if use apparmor; then
169 - systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
170 - else
171 - systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
172 - fi
173 -
174 - systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
175 - systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
176 -
177 - dodoc AUTHORS doc/*
178 - use nls && domo po/*.mo
179 -}
180 -
181 -pkg_postinst() {
182 - elog
183 - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
184 - elog "including a Quick Start."
185 - elog
186 - elog "Please run 'lxc-checkconfig' to see all optional kernel features."
187 - elog
188 - optfeature "btrfs storage backend" sys-fs/btrfs-progs
189 - optfeature "lvm2 storage backend" sys-fs/lvm2
190 - optfeature "zfs storage backend" sys-fs/zfs
191 - elog
192 - elog "Be sure to add your local user to the lxd group."
193 -}