diff options
Diffstat (limited to 'app-containers/lxd')
| -rw-r--r-- | app-containers/lxd/Manifest | 5 | ||||
| -rw-r--r-- | app-containers/lxd/files/lxd-4.0.7-no-werror.patch | 108 | ||||
| -rw-r--r-- | app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch | 75 | ||||
| -rw-r--r-- | app-containers/lxd/lxd-4.0.8-r3.ebuild | 190 |
4 files changed, 0 insertions, 378 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 9519fcf1694e..56126823385b 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -1,16 +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-4.0.9-r1.service 612 BLAKE2B e44029b6f615afc0daf8abfccd7d2e472291d9b1f8530b64f5c9b7d96aeda605a0dd0ec9b74f0a79f68992a45607e4362a7c30c711b34ac106b9377610f97ad6 SHA512 68800d9952e865eeffe1c05ecf111c49e6b137c6f7af7c7b02daf180c3a794a670ddbe7140e97d187f1b9a803ca84e132303808ed8b6ae49760246c01d7c60d4 AUX lxd-4.0.9.initd 1333 BLAKE2B 72a27d38527b4f0dcca3b111ae0d112bd128cf83ff6261561c5a3bf1c619a2e36672b5eb06ff643660d3cee05a545991ed565be257a56452cbd498a202e1b197 SHA512 933a09e72dbf3bbab8e2148549b6bc08ac0caf2088bd44c3e378ac6041fa861845bfae351c83fcd0920655ceb29ea6ca8023163c52a2fb7499c9bf2958d4dc86 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 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886 -EBUILD lxd-4.0.8-r3.ebuild 5019 BLAKE2B d320ef4a693b34132b69bf530f4397e585510fc934fef816c66bfb5de08f81404e16abe1fb3e57c64856bcba75a02cac4d4e4cb95700ee1d5360e7c1ddcd655e SHA512 77c77eb5fa83156cd27aeb462ad3f5c4514f1f0deaffddaa96b957cdf6f1027314094310c108b13f4ed1364c029aa78b69c055911e597a29dbdc41cf0e1c38f4 EBUILD lxd-4.0.9-r3.ebuild 4790 BLAKE2B a9311e2749fe23a9da3768f95d222161ce56af1bb100b098c30e30b645e1b3b911edf038a1ecf7044b4d8527385ffa2b270aa15040597503cdaf83e91d3e175d SHA512 74093b3e455f3a8adf49a8083b60cbac5196d9472b658bc259106659cb26347e565d87c132efb3c24b5b544c532056c2b6a88853b3d040aae191be626fcb3292 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c 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 deleted file mode 100644 index 50a916356019..000000000000 --- a/app-containers/lxd/files/lxd-4.0.7-no-werror.patch +++ /dev/null @@ -1,108 +0,0 @@ -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.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 deleted file mode 100644 index f32debff5e3b..000000000000 --- a/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5efac9cfed92a890dc1a073fe60b1c814c305267 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com> -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 <stgraber@ubuntu.com> ---- - 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/lxd-4.0.8-r3.ebuild b/app-containers/lxd/lxd-4.0.8-r3.ebuild deleted file mode 100644 index f301c886cd62..000000000000 --- a/app-containers/lxd/lxd-4.0.8-r3.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 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 - - ~KVM - ~MACVTAP - ~VHOST_VSOCK -" - -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." - -WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines." -WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines." -WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines." - -# 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.go \ - 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 "For virtual machine support, see:" - elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines" - elog - elog "Please run 'lxc-checkconfig' to see all optional kernel features." - elog - optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] - 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." -} |