1 |
commit: c6f02344816966e98f4f41d014b30855e9355410 |
2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 3 06:40:04 2023 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 07:14:58 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f02344 |
7 |
|
8 |
app-containers/lxd: drop 5.0.1-r7 |
9 |
|
10 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
11 |
|
12 |
app-containers/lxd/Manifest | 4 - |
13 |
...0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch | 27 --- |
14 |
app-containers/lxd/lxd-5.0.1-r7.ebuild | 217 --------------------- |
15 |
3 files changed, 248 deletions(-) |
16 |
|
17 |
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest |
18 |
index fd079b683160..7a4e3af6d38c 100644 |
19 |
--- a/app-containers/lxd/Manifest |
20 |
+++ b/app-containers/lxd/Manifest |
21 |
@@ -1,8 +1,4 @@ |
22 |
DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb |
23 |
DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886 |
24 |
-DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed |
25 |
-DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294 |
26 |
-DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 BLAKE2B 4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed SHA512 266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7 |
27 |
DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b SHA512 e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa |
28 |
DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc |
29 |
-DIST lxd-5.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e SHA512 5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9 |
30 |
|
31 |
diff --git a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch b/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch |
32 |
deleted file mode 100644 |
33 |
index c6cf6c97b013..000000000000 |
34 |
--- a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch |
35 |
+++ /dev/null |
36 |
@@ -1,27 +0,0 @@ |
37 |
-From 37779fd75dbcd02fab03a8327a1ec7a6f3273371 Mon Sep 17 00:00:00 2001 |
38 |
-From: Thomas Parrott <thomas.parrott@×××××××××.com> |
39 |
-Date: Wed, 4 Jan 2023 09:59:37 +0000 |
40 |
-Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Fix getQGroup to |
41 |
- suport BTRFS >= 6.0.1 |
42 |
- |
43 |
-Fixes #11210 |
44 |
- |
45 |
-Signed-off-by: Thomas Parrott <thomas.parrott@×××××××××.com> |
46 |
---- |
47 |
- lxd/storage/drivers/driver_btrfs_utils.go | 3 ++- |
48 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
49 |
- |
50 |
-diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go |
51 |
-index 8f0846d2fc9f..e1468e4b1a59 100644 |
52 |
---- a/lxd/storage/drivers/driver_btrfs_utils.go |
53 |
-+++ b/lxd/storage/drivers/driver_btrfs_utils.go |
54 |
-@@ -247,7 +247,8 @@ func (d *btrfs) getQGroup(path string) (string, int64, error) { |
55 |
- var qgroup string |
56 |
- usage := int64(-1) |
57 |
- for _, line := range strings.Split(output, "\n") { |
58 |
-- if line == "" || strings.HasPrefix(line, "qgroupid") || strings.HasPrefix(line, "---") { |
59 |
-+ // Use case-insensitive field title match because BTRFS tooling changed casing between versions. |
60 |
-+ if line == "" || strings.HasPrefix(strings.ToLower(line), "qgroupid") || strings.HasPrefix(line, "-") { |
61 |
- continue |
62 |
- } |
63 |
- |
64 |
|
65 |
diff --git a/app-containers/lxd/lxd-5.0.1-r7.ebuild b/app-containers/lxd/lxd-5.0.1-r7.ebuild |
66 |
deleted file mode 100644 |
67 |
index fb1952e6d9c7..000000000000 |
68 |
--- a/app-containers/lxd/lxd-5.0.1-r7.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,217 +0,0 @@ |
71 |
-# Copyright 1999-2023 Gentoo Authors |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
- |
74 |
-EAPI=8 |
75 |
- |
76 |
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig |
77 |
- |
78 |
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" |
79 |
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd" |
80 |
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz |
81 |
- https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch |
82 |
- https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch -> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch |
83 |
- verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" |
84 |
- |
85 |
-LICENSE="Apache-2.0" |
86 |
-SLOT="0" |
87 |
-KEYWORDS="amd64 ~arm64 ~x86" |
88 |
-IUSE="apparmor nls" |
89 |
- |
90 |
-DEPEND="acct-group/lxd |
91 |
- app-arch/xz-utils |
92 |
- >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] |
93 |
- dev-db/sqlite:3 |
94 |
- dev-libs/dqlite:= |
95 |
- dev-libs/lzo |
96 |
- dev-libs/raft:=[lz4] |
97 |
- >=dev-util/xdelta-3.0[lzma(+)] |
98 |
- net-dns/dnsmasq[dhcp] |
99 |
- sys-libs/libcap |
100 |
- virtual/udev" |
101 |
-RDEPEND="${DEPEND} |
102 |
- net-firewall/ebtables |
103 |
- net-firewall/iptables |
104 |
- sys-apps/iproute2 |
105 |
- sys-fs/fuse:* |
106 |
- >=sys-fs/lxcfs-5.0.0 |
107 |
- sys-fs/squashfs-tools[lzma] |
108 |
- virtual/acl" |
109 |
-BDEPEND="dev-lang/go |
110 |
- nls? ( sys-devel/gettext ) |
111 |
- verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" |
112 |
- |
113 |
-CONFIG_CHECK=" |
114 |
- ~CGROUPS |
115 |
- ~IPC_NS |
116 |
- ~NET_NS |
117 |
- ~PID_NS |
118 |
- |
119 |
- ~SECCOMP |
120 |
- ~USER_NS |
121 |
- ~UTS_NS |
122 |
- |
123 |
- ~KVM |
124 |
- ~MACVTAP |
125 |
- ~VHOST_VSOCK |
126 |
-" |
127 |
- |
128 |
-ERROR_IPC_NS="CONFIG_IPC_NS is required." |
129 |
-ERROR_NET_NS="CONFIG_NET_NS is required." |
130 |
-ERROR_PID_NS="CONFIG_PID_NS is required." |
131 |
-ERROR_SECCOMP="CONFIG_SECCOMP is required." |
132 |
-ERROR_UTS_NS="CONFIG_UTS_NS is required." |
133 |
- |
134 |
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines." |
135 |
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines." |
136 |
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines." |
137 |
- |
138 |
-# Go magic. |
139 |
-QA_PREBUILT="/usr/bin/fuidshift |
140 |
- /usr/bin/lxc |
141 |
- /usr/bin/lxc-to-lxd |
142 |
- /usr/bin/lxd-agent |
143 |
- /usr/bin/lxd-benchmark |
144 |
- /usr/bin/lxd-migrate |
145 |
- /usr/sbin/lxd" |
146 |
- |
147 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc |
148 |
- |
149 |
-# The testsuite must be run as root. |
150 |
-# make: *** [Makefile:156: check] Error 1 |
151 |
-RESTRICT="test" |
152 |
- |
153 |
-GOPATH="${S}/_dist" |
154 |
- |
155 |
-PATCHES=( "${DISTDIR}"/lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch |
156 |
- "${DISTDIR}"/lxd-5.8-add-tcp-keepalives-to-exec-channels.patch |
157 |
- "${FILESDIR}"/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch ) |
158 |
- |
159 |
-src_unpack() { |
160 |
- if use verify-sig; then |
161 |
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} |
162 |
- fi |
163 |
- |
164 |
- default |
165 |
-} |
166 |
- |
167 |
-src_prepare() { |
168 |
- export GOPATH="${S}/_dist" |
169 |
- |
170 |
- default |
171 |
- |
172 |
- sed -i \ |
173 |
- -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ |
174 |
- -e "s:make:make ${MAKEOPTS}:g" \ |
175 |
- Makefile || die |
176 |
- |
177 |
- # Fix hardcoded ovmf file path, see bug 763180 |
178 |
- sed -i \ |
179 |
- -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ |
180 |
- -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \ |
181 |
- doc/environment.md \ |
182 |
- lxd/apparmor/instance.go \ |
183 |
- lxd/apparmor/instance_qemu.go \ |
184 |
- lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." |
185 |
- |
186 |
- # Fix hardcoded virtfs-proxy-helper file path, see bug 798924 |
187 |
- sed -i \ |
188 |
- -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \ |
189 |
- lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." |
190 |
- |
191 |
- cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die |
192 |
- if use apparmor; then |
193 |
- sed -i \ |
194 |
- '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ |
195 |
- "${T}"/lxd.service || die |
196 |
- fi |
197 |
- |
198 |
- # Disable -Werror's from go modules. |
199 |
- find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die |
200 |
-} |
201 |
- |
202 |
-src_configure() { :; } |
203 |
- |
204 |
-src_compile() { |
205 |
- export GOPATH="${S}/_dist" |
206 |
- export CGO_LDFLAGS_ALLOW="-Wl,-z,now" |
207 |
- |
208 |
- for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do |
209 |
- go install -v -x "${S}/${k}" || die "failed compiling ${k}" |
210 |
- done |
211 |
- |
212 |
- go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon" |
213 |
- |
214 |
- # Needs to be built statically |
215 |
- CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate |
216 |
- CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent |
217 |
- |
218 |
- use nls && emake build-mo |
219 |
-} |
220 |
- |
221 |
-src_test() { |
222 |
- emake check |
223 |
-} |
224 |
- |
225 |
-src_install() { |
226 |
- export GOPATH="${S}/_dist" |
227 |
- local bindir="_dist/bin" |
228 |
- |
229 |
- dosbin ${bindir}/lxd |
230 |
- |
231 |
- for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do |
232 |
- dobin ${bindir}/${l} |
233 |
- done |
234 |
- |
235 |
- newbashcomp scripts/bash/lxd-client lxc |
236 |
- |
237 |
- newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd |
238 |
- newinitd "${FILESDIR}"/lxd-5.0.2-r1.initd lxd |
239 |
- |
240 |
- systemd_dounit "${T}"/lxd.service |
241 |
- systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service |
242 |
- systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket |
243 |
- |
244 |
- dodoc AUTHORS |
245 |
- dodoc -r doc/* |
246 |
- use nls && domo po/*.mo |
247 |
-} |
248 |
- |
249 |
-pkg_postinst() { |
250 |
- elog |
251 |
- elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," |
252 |
- elog "including a Quick Start." |
253 |
- elog "For virtual machine support, see:" |
254 |
- elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines" |
255 |
- elog |
256 |
- elog "Please run 'lxc-checkconfig' to see all optional kernel features." |
257 |
- elog |
258 |
- optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] |
259 |
- optfeature "btrfs storage backend" sys-fs/btrfs-progs |
260 |
- optfeature "ipv6 support" net-dns/dnsmasq[ipv6] |
261 |
- optfeature "lvm2 storage backend" sys-fs/lvm2 |
262 |
- optfeature "zfs storage backend" sys-fs/zfs |
263 |
- elog |
264 |
- elog "Be sure to add your local user to the lxd group." |
265 |
- |
266 |
- if [[ ${REPLACING_VERSIONS} ]] && |
267 |
- ver_test ${REPLACING_VERSIONS} -lt 5.0.1 && |
268 |
- has_version app-emulation/qemu[spice,usbredir,virtfs]; then |
269 |
- ewarn "" |
270 |
- ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent" |
271 |
- ewarn "product, you'll have to restart any running virtual machines before they work" |
272 |
- ewarn "properly." |
273 |
- ewarn "" |
274 |
- ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd." |
275 |
- ewarn "" |
276 |
- fi |
277 |
- |
278 |
- if [[ ${REPLACING_VERSIONS} ]] && |
279 |
- has_version "sys-apps/openrc"; then |
280 |
- elog "" |
281 |
- elog "The new init.d script will attempt to mount " |
282 |
- elog " /sys/fs/cgroup/systemd" |
283 |
- elog "by default, which is needed to run systemd containers with openrc host." |
284 |
- elog "See the /etc/init.d/lxd file for requirements." |
285 |
- elog "" |
286 |
- fi |
287 |
-} |