From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- app-containers/lxd/Manifest | 11 ++ app-containers/lxd/files/lxd-4.0.0.confd | 23 +++ app-containers/lxd/files/lxd-4.0.0.initd | 47 ++++++ app-containers/lxd/files/lxd-4.0.0.socket | 12 ++ app-containers/lxd/files/lxd-4.0.7-no-werror.patch | 108 +++++++++++++ app-containers/lxd/files/lxd-4.0.7-r1.service | 20 +++ ...d-4.0.8-btrfs-progs-5.14-safety-check-fix.patch | 75 +++++++++ .../lxd/files/lxd-containers-4.0.0.service | 16 ++ app-containers/lxd/lxd-4.0.8-r1.ebuild | 178 +++++++++++++++++++++ app-containers/lxd/metadata.xml | 24 +++ 10 files changed, 514 insertions(+) create mode 100644 app-containers/lxd/Manifest create mode 100644 app-containers/lxd/files/lxd-4.0.0.confd create mode 100644 app-containers/lxd/files/lxd-4.0.0.initd create mode 100644 app-containers/lxd/files/lxd-4.0.0.socket create mode 100644 app-containers/lxd/files/lxd-4.0.7-no-werror.patch create mode 100644 app-containers/lxd/files/lxd-4.0.7-r1.service create mode 100644 app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch create mode 100644 app-containers/lxd/files/lxd-containers-4.0.0.service create mode 100644 app-containers/lxd/lxd-4.0.8-r1.ebuild create mode 100644 app-containers/lxd/metadata.xml (limited to 'app-containers/lxd') diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest new file mode 100644 index 000000000000..974ed6d1d03c --- /dev/null +++ b/app-containers/lxd/Manifest @@ -0,0 +1,11 @@ +AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4 +AUX lxd-4.0.0.initd 1221 BLAKE2B cdff6d900e09f85d9a4dc86b30f0d32b848689e209b79b48217e2f844a48fb358850cbc27db1aed7c1b957bbc19af2d76856fd65319a0a207cedfefbadf659cc SHA512 8b176036c1e5f2ffac4c94e781694fb637fa53666f10da1d5d2b3f1fc341f02003e5306dbd332edd9eeb6f7b08dffd9190c7f65361a40220f6f88d56e4c78a57 +AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661 +AUX lxd-4.0.7-no-werror.patch 5387 BLAKE2B a13ef0b87a91aa5e44a3bc527c8d339249653139bbc35d78a1b0f0c1f3412b083f7016e634640dff1e3ab18099e5b56551c7fb2eb6b898f984cb2f9f90acafc2 SHA512 6abb81bc43cc82a2716cce8e68741d32db33d860a09fc21e5df781c298abf7e88fc5ccab1513e1d635c839a801e092c16d7e92eb0fe616a3b680db47153dcf0c +AUX lxd-4.0.7-r1.service 497 BLAKE2B 90141dce8dbef52521c5f9c2924111904f8b0528e8555afb8a2eb8d9dc8b4c6b32b543a6ee3caf42dc0a90f20d35d40810a3f0828a88377e91424f7b00e589a8 SHA512 91fa16a9e9de2eda34c06ec66c144a43fe1cb23c99137cbd830ff9621c7362989404ca9906e4f53b3c10ba84c3cc950713cb69ed7a81bd66f07935312f8f75f8 +AUX lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch 2184 BLAKE2B ee6b371694a594606b25ac6950032f3613be4da470c9b991bf30f0f1911b563844f20180009c7049f1e5ad461e83025f82764ae00777bc811e05b26a2b6690b8 SHA512 7d126f4c59007862dce8dd4273b1b335a6f29e1631012adb7f1486778179dc03a2e94aa3fed38b7ad075fd65bf2efb580800b9450dac21c088778d0cef32fcff +AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 +DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6 +DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9 +EBUILD lxd-4.0.8-r1.ebuild 4542 BLAKE2B f9ff9870aaf7b3638cf7296a8b26edfec266c3280c4d4c8059a5e9c9266d1be36f03c3319f66d46c832b0bb8e6076065b0c427ff8f2ffcef25b91d3a4addfc1a SHA512 31c5f59028c495bb2308b9f71ca616267aca235f0f66d876be9bc30202018d4202d56b27d19c11524c7f99574f6c1651c9b4e4c773e8ad723bc76fd437fcc091 +MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c diff --git a/app-containers/lxd/files/lxd-4.0.0.confd b/app-containers/lxd/files/lxd-4.0.0.confd new file mode 100644 index 000000000000..68cf344995be --- /dev/null +++ b/app-containers/lxd/files/lxd-4.0.0.confd @@ -0,0 +1,23 @@ +# Group which owns the shared socket +LXD_OPTIONS+=" --group lxd" + +# Enable cpu profiling into the specified file +#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile" + +# Enable memory profiling into the specified file +#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile" + +# Enable debug mode +#LXD_OPTIONS+=" --debug" + +# For debugging, print a complete stack trace every n seconds +#LXD_OPTIONS+=" --print-goroutines-every 5" + +# Enable verbose mode +#LXD_OPTIONS+=" -v" + +# Logfile to log to +#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log" + +# Enable syslog logging +#LXD_OPTIONS+=" --syslog" diff --git a/app-containers/lxd/files/lxd-4.0.0.initd b/app-containers/lxd/files/lxd-4.0.0.initd new file mode 100644 index 000000000000..e6ae971e879f --- /dev/null +++ b/app-containers/lxd/files/lxd-4.0.0.initd @@ -0,0 +1,47 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DAEMON=/usr/sbin/lxd +PIDFILE=/run/lxd.pid + +depend() { + need net + need lxcfs +} + +start() { + ebegin "Starting lxd service" + + modprobe -f loop > /dev/null 2>&1 + + # fix permissions on /var/lib/lxd and make sure it exists + install -d /var/lib/lxd --group lxd --owner root --mode 0775 + start-stop-daemon --start \ + --pidfile ${PIDFILE} \ + --exec ${DAEMON} \ + --background \ + --make-pidfile \ + -- \ + ${LXD_OPTIONS} + eend ${?} +} + +stop() { + if [ "${RC_CMD}" = restart ]; then + ebegin "Stopping lxd service (but not containers)" + # start-stop-daemon sends SIGTERM with a timeout of 5s by default. + # SIGTERM indicates to LXD that it will be stopped temporarily. + # Instances will keep running. + start-stop-daemon --stop --quiet -p "${PIDFILE}" + eend ${?} + else + ebegin "Stopping lxd service and containers, waiting 40s" + # SIGPWR indicates to LXD that the host is going down. + # LXD will do a clean shutdown of all instances. + # After 30s all remaining instances will be killed. + # We wait up to 40s for LXD. + start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}" + eend ${?} + fi +} diff --git a/app-containers/lxd/files/lxd-4.0.0.socket b/app-containers/lxd/files/lxd-4.0.0.socket new file mode 100644 index 000000000000..3207c9453d11 --- /dev/null +++ b/app-containers/lxd/files/lxd-4.0.0.socket @@ -0,0 +1,12 @@ +[Unit] +Description=LXD - unix socket +Documentation=man:lxd(1) + +[Socket] +ListenStream=/var/lib/lxd/unix.socket +SocketGroup=lxd +SocketMode=0660 +Service=lxd.service + +[Install] +WantedBy=sockets.target diff --git a/app-containers/lxd/files/lxd-4.0.7-no-werror.patch b/app-containers/lxd/files/lxd-4.0.7-no-werror.patch new file mode 100644 index 000000000000..50a916356019 --- /dev/null +++ b/app-containers/lxd/files/lxd-4.0.7-no-werror.patch @@ -0,0 +1,108 @@ +diff -Naur lxd-4.0.7/lxd/cgo.go lxd-4.0.7-no-werror/lxd/cgo.go +--- lxd-4.0.7/lxd/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/cgo.go 2021-11-16 15:16:23.575299112 +0200 +@@ -3,7 +3,7 @@ + + package main + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd/seccomp/cgo.go lxd-4.0.7-no-werror/lxd/seccomp/cgo.go +--- lxd-4.0.7/lxd/seccomp/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/seccomp/cgo.go 2021-11-16 15:16:34.928629720 +0200 +@@ -3,7 +3,7 @@ + + package seccomp + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd/storage/cgo.go lxd-4.0.7-no-werror/lxd/storage/cgo.go +--- lxd-4.0.7/lxd/storage/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/storage/cgo.go 2021-11-16 15:16:44.585294068 +0200 +@@ -3,7 +3,7 @@ + + package storage + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd/storage/quota/cgo.go lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go +--- lxd-4.0.7/lxd/storage/quota/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go 2021-11-16 15:16:54.231958418 +0200 +@@ -3,7 +3,7 @@ + + package quota + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/lxd-p2c/cgo.go lxd-4.0.7-no-werror/lxd-p2c/cgo.go +--- lxd-4.0.7/lxd-p2c/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/lxd-p2c/cgo.go 2021-11-16 15:17:06.185288881 +0200 +@@ -2,7 +2,7 @@ + + package main + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/cgo.go lxd-4.0.7-no-werror/shared/cgo.go +--- lxd-4.0.7/shared/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/cgo.go 2021-11-16 15:17:15.238620041 +0200 +@@ -3,7 +3,7 @@ + + package shared + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/idmap/cgo.go lxd-4.0.7-no-werror/shared/idmap/cgo.go +--- lxd-4.0.7/shared/idmap/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/idmap/cgo.go 2021-11-16 15:17:25.768617513 +0200 +@@ -3,7 +3,7 @@ + + package idmap + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/netutils/cgo.go lxd-4.0.7-no-werror/shared/netutils/cgo.go +--- lxd-4.0.7/shared/netutils/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/netutils/cgo.go 2021-11-16 15:17:34.598615393 +0200 +@@ -3,7 +3,7 @@ + + package netutils + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration +diff -Naur lxd-4.0.7/shared/termios/cgo.go lxd-4.0.7-no-werror/shared/termios/cgo.go +--- lxd-4.0.7/shared/termios/cgo.go 2021-07-16 23:33:23.000000000 +0300 ++++ lxd-4.0.7-no-werror/shared/termios/cgo.go 2021-11-16 15:17:43.568613239 +0200 +@@ -3,7 +3,7 @@ + + package termios + +-// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self ++// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self + // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables + // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused + // #cgo CFLAGS: -Werror=implicit-function-declaration diff --git a/app-containers/lxd/files/lxd-4.0.7-r1.service b/app-containers/lxd/files/lxd-4.0.7-r1.service new file mode 100644 index 000000000000..f1e644b95df8 --- /dev/null +++ b/app-containers/lxd/files/lxd-4.0.7-r1.service @@ -0,0 +1,20 @@ +[Unit] +Description=LXD - main daemon +After=network-online.target lxcfs.service lxd.socket +Requires=network-online.target lxcfs.service lxd.socket +Documentation=man:lxd(1) + +[Service] +EnvironmentFile=-/etc/environment +ExecStart=/usr/sbin/lxd --group lxd --syslog +ExecStartPost=/usr/sbin/lxd waitready --timeout=600 +KillMode=process +TimeoutStartSec=600s +TimeoutStopSec=30s +Restart=on-failure +LimitNOFILE=1048576 +LimitNPROC=infinity +TasksMax=infinity + +[Install] +Also=lxd-containers.service lxd.socket diff --git a/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch b/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch new file mode 100644 index 000000000000..f32debff5e3b --- /dev/null +++ b/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch @@ -0,0 +1,75 @@ +From 5efac9cfed92a890dc1a073fe60b1c814c305267 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Thu, 4 Nov 2021 14:05:27 -0400 +Subject: [PATCH] lxd/storage/btrfs: Support 5.14.2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Closes #9418 + +Signed-off-by: Stéphane Graber +--- + lxd/storage/drivers/driver_btrfs.go | 18 ++++++++++++++++++ + lxd/storage/drivers/driver_btrfs_utils.go | 8 +++++++- + 2 files changed, 25 insertions(+), 1 deletion(-) + +diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go +index e6a64bf8136..a47be766f8f 100644 +--- a/lxd/storage/drivers/driver_btrfs.go ++++ b/lxd/storage/drivers/driver_btrfs.go +@@ -17,10 +17,12 @@ import ( + "github.com/lxc/lxd/shared/api" + "github.com/lxc/lxd/shared/units" + "github.com/lxc/lxd/shared/validate" ++ "github.com/lxc/lxd/shared/version" + ) + + var btrfsVersion string + var btrfsLoaded bool ++var btrfsPropertyForce bool + + type btrfs struct { + common +@@ -64,6 +66,22 @@ func (d *btrfs) load() error { + } + } + ++ // Check if we need --force to set properties. ++ ver5142, err := version.Parse("5.14.2") ++ if err != nil { ++ return err ++ } ++ ++ ourVer, err := version.Parse(btrfsVersion) ++ if err != nil { ++ return err ++ } ++ ++ // If running 5.14.2 or older, we need --force. ++ if ourVer.Compare(ver5142) > 0 { ++ btrfsPropertyForce = true ++ } ++ + btrfsLoaded = true + return nil + } +diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go +index e1a359e8490..0618e29e6f2 100644 +--- a/lxd/storage/drivers/driver_btrfs_utils.go ++++ b/lxd/storage/drivers/driver_btrfs_utils.go +@@ -308,7 +308,13 @@ func (d *btrfs) setSubvolumeReadonlyProperty(path string, readonly bool) error { + return nil + } + +- _, err := shared.RunCommand("btrfs", "property", "set", "-ts", path, "ro", fmt.Sprintf("%t", readonly)) ++ args := []string{"property", "set"} ++ if btrfsPropertyForce { ++ args = append(args, "-f") ++ } ++ args = append(args, "-ts", path, "ro", fmt.Sprintf("%t", readonly)) ++ ++ _, err := shared.RunCommand("btrfs", args...) + return err + } + diff --git a/app-containers/lxd/files/lxd-containers-4.0.0.service b/app-containers/lxd/files/lxd-containers-4.0.0.service new file mode 100644 index 000000000000..894760c3506b --- /dev/null +++ b/app-containers/lxd/files/lxd-containers-4.0.0.service @@ -0,0 +1,16 @@ +[Unit] +Description=LXD - container startup/shutdown +Documentation=man:lxd(1) +After=lxd.socket lxd.service +Requires=lxd.socket + +[Service] +Type=oneshot +ExecStart=/usr/sbin/lxd activateifneeded +ExecStop=/usr/sbin/lxd shutdown +TimeoutStartSec=600s +TimeoutStopSec=600s +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/app-containers/lxd/lxd-4.0.8-r1.ebuild b/app-containers/lxd/lxd-4.0.8-r1.ebuild new file mode 100644 index 000000000000..11314dde35da --- /dev/null +++ b/app-containers/lxd/lxd-4.0.8-r1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 linux-info optfeature systemd verify-sig + +DESCRIPTION="Fast, dense and secure container management" +HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd" +SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="apparmor ipv6 nls verify-sig" + +DEPEND="acct-group/lxd + app-arch/xz-utils + >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] + dev-db/sqlite:3 + dev-libs/dqlite + dev-libs/lzo + dev-libs/raft[lz4] + >=dev-util/xdelta-3.0[lzma(+)] + net-dns/dnsmasq[dhcp,ipv6?] + sys-libs/libcap + virtual/udev" +RDEPEND="${DEPEND} + net-firewall/ebtables + net-firewall/iptables[ipv6?] + sys-apps/iproute2[ipv6?] + sys-fs/fuse:* + sys-fs/lxcfs + sys-fs/squashfs-tools[lzma] + virtual/acl" +BDEPEND="dev-lang/go + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" + +CONFIG_CHECK=" + ~CGROUPS + ~IPC_NS + ~NET_NS + ~PID_NS + + ~SECCOMP + ~USER_NS + ~UTS_NS +" + +ERROR_IPC_NS="CONFIG_IPC_NS is required." +ERROR_NET_NS="CONFIG_NET_NS is required." +ERROR_PID_NS="CONFIG_PID_NS is required." +ERROR_SECCOMP="CONFIG_SECCOMP is required." +ERROR_UTS_NS="CONFIG_UTS_NS is required." + +# Go magic. +QA_PREBUILT="/usr/bin/fuidshift + /usr/bin/lxc + /usr/bin/lxc-to-lxd + /usr/bin/lxd-agent + /usr/bin/lxd-benchmark + /usr/bin/lxd-p2c + /usr/sbin/lxd" + +EGO_PN="github.com/lxc/lxd" +GOPATH="${S}/_dist" # this seems to reset every now and then, though + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +# The testsuite must be run as root. +# make: *** [Makefile:156: check] Error 1 +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch + "${FILESDIR}"/lxd-4.0.7-no-werror.patch ) + +src_prepare() { + default + + export GOPATH="${S}/_dist" + + sed -i \ + -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ + -e "s:make:make ${MAKEOPTS}:g" \ + Makefile || die + + # Fix hardcoded ovmf file path, see bug 763180 + sed -i \ + -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ + -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \ + doc/environment.md \ + lxd/apparmor/instance_qemu.go \ + lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." + + # Fix hardcoded virtfs-proxy-helper file path, see bug 798924 + sed -i \ + -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \ + lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path." + + cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die + if use apparmor; then + sed -i \ + '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ + "${T}"/lxd.service || die + fi +} + +src_configure() { :; } + +src_compile() { + export GOPATH="${S}/_dist" + export GO111MODULE=auto + export CGO_LDFLAGS_ALLOW="-Wl,-z,now" + + cd "${S}" || die + + for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do + go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}" + done + + go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" + + # Needs to be built statically + CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c + CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent + + use nls && emake build-mo +} + +src_test() { + emake check +} + +src_install() { + local bindir="_dist/bin" + export GOPATH="${S}/_dist" + + dosbin ${bindir}/lxd + + for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do + dobin ${bindir}/${l} + done + + cd "${S}" || die + + newbashcomp scripts/bash/lxd-client lxc + + newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd + newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd + + systemd_dounit "${T}"/lxd.service + + systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service + systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket + + # Temporary fix for #817287 + keepdir /var/log/lxd + fowners root:lxd /var/log/lxd + + dodoc AUTHORS doc/* + use nls && domo po/*.mo +} + +pkg_postinst() { + elog + elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," + elog "including a Quick Start." + elog + elog "Please run 'lxc-checkconfig' to see all optional kernel features." + elog + optfeature "btrfs storage backend" sys-fs/btrfs-progs + optfeature "lvm2 storage backend" sys-fs/lvm2 + optfeature "zfs storage backend" sys-fs/zfs + elog + elog "Be sure to add your local user to the lxd group." +} diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml new file mode 100644 index 000000000000..dfd11315a93a --- /dev/null +++ b/app-containers/lxd/metadata.xml @@ -0,0 +1,24 @@ + + + + + juippis@gentoo.org + Joonas Niilola + + + virtualization@gentoo.org + Gentoo Virtualization Project + + + Enable AppArmor support + + + By combining the speed and density of containers with + the security of traditional virtual machines, LXD is + the next-generation of container hypervisor for Linux + from Canonical. + + + lxc/lxd + + -- cgit v1.2.3