From 67efaff61522aeb024152ab6cddf7c40ffacb530 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Oct 2023 21:52:41 +0100 Subject: gentoo auto-resync : 19:10:2023 - 21:52:41 --- app-containers/Manifest.gz | Bin 8877 -> 8877 bytes app-containers/incus/Manifest | 2 +- app-containers/incus/incus-0.1-r2.ebuild | 1 + app-containers/lxd/Manifest | 11 +- ...5.17-remove-shellcheck-buildsystem-checks.patch | 31 ---- app-containers/lxd/lxd-5.0.2-r3.ebuild | 2 +- app-containers/lxd/lxd-5.17.ebuild | 192 --------------------- app-containers/lxd/lxd-5.18.ebuild | 2 +- app-containers/lxd/lxd-5.19.ebuild | 188 ++++++++++++++++++++ 9 files changed, 197 insertions(+), 232 deletions(-) delete mode 100644 app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch delete mode 100644 app-containers/lxd/lxd-5.17.ebuild create mode 100644 app-containers/lxd/lxd-5.19.ebuild (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index ad9bcbf72a79..8d97d791d6e2 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest index 55768456cdb3..c11e97ccce85 100644 --- a/app-containers/incus/Manifest +++ b/app-containers/incus/Manifest @@ -5,5 +5,5 @@ AUX incus-0.1.socket 207 BLAKE2B d1fb41c9a90e0f06eb34c466a460e2d202250769ef3db38 AUX incus-containers-0.1.service 338 BLAKE2B af0849575d2d7578634228576fcf449f8ab54b6fa3a974baec4f91009dec4a6e76253f3724c532f38fc7484ccc6caffae4badf1591c1b04abb3414f4959d550c SHA512 9a9b072442a63683cb9ed71d706606da682e821f609f1f4daea0562ddcea1cc2d6157b29fd466e0aeab149f31b54ab0fff4cf41831e6b2378c47619b8dfd0b55 DIST incus-0.1.tar.gz 21498887 BLAKE2B ea200f83922a2f23c8bbc8ce94ccf7df8b7e096adfe6697d94135a4c660a950411e2176f860a63dada12890cde474beb16fcd17a4c52419f1ab86d3625c426e5 SHA512 1cd5410b07ed44f05b19ca3c734a67bde6f85d0e4673e9b46100bb8f2d60889773bcde1a274e96b55651b95414c47abeb6c3f2b8ec8d500d22ef08e31d09d9e6 DIST incus-0.1.tar.gz.asc 833 BLAKE2B 9e2ceedf246e7af20a6d8c0e597f59016a4040c10d547f724a0fa822387bb46c70d0467df583127bea874ded87115844e02191e93ddfd29fc64f3bc0262b7f10 SHA512 de14e530543d861ea3bdffe8d4b88a140f39646219c1494db81577f755d5d5ddc35f8e36f51cbfe38d8fcd4c3de95bb8d615db61530bbd507a55c6e07d3031b6 -EBUILD incus-0.1-r2.ebuild 5000 BLAKE2B f01afbc669d4a6d4b2baacf3e99483228c516b45f2156ca42ec4a74053aa5c645fe986b6bfad40efb8a3c8ee18377e9947846ac74723a7842d4ddd3ffd55aba2 SHA512 d2bad62494de5e73cfce2d749a60c5f8edf57215353ef2707654977b1cd92414abaa38350e7c59f8adc462bbc4b0610a27cf8cfea779f77f0b59565586f94568 +EBUILD incus-0.1-r2.ebuild 5056 BLAKE2B eb8be4c3be7995c08d2096e8daf24f88cd4ea09d643a6d26b1564d87ca7915adf01dd7458ba093bc4f85efefcad21fb3ab3698cda658b03c1af04c299cd4ad09 SHA512 a5521e824541860adbccb22146ca2c7889ba52cafcd084a10f1ef8bca9122c387ba0f6c50ac68d4ff35cb14ee42be2932e0d0273e733e5cf91c5a38232cb7c49 MISC metadata.xml 1471 BLAKE2B d3447fd360c4d3de95ffafefd39f9e65dd257cd39cbdb14fc2e2c513239fafe48b0fef44653fe8fdaaf54151afe59cf48f3f0909097d0c0c4a82cbd87aac4d44 SHA512 393edc7c7f202fac4f08abd2544d1fb41cfc83cea66ccf239eb4441c1f13ea85dd519de84094b1ba022b1a17658612591ee4354a77484da4d8095af917a87c25 diff --git a/app-containers/incus/incus-0.1-r2.ebuild b/app-containers/incus/incus-0.1-r2.ebuild index b7d760e2001d..3f7bd4e3a5f5 100644 --- a/app-containers/incus/incus-0.1-r2.ebuild +++ b/app-containers/incus/incus-0.1-r2.ebuild @@ -174,6 +174,7 @@ pkg_postinst() { optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] optfeature "btrfs storage backend" sys-fs/btrfs-progs optfeature "ipv6 support" net-dns/dnsmasq[ipv6] + optfeature "full incus-migrate support" net-misc/rsync optfeature "lvm2 storage backend" sys-fs/lvm2 optfeature "zfs storage backend" sys-fs/zfs elog diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index a8de58938b01..6798833c7e01 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -6,19 +6,18 @@ AUX lxd-4.0.9.initd 1333 BLAKE2B 72a27d38527b4f0dcca3b111ae0d112bd128cf83ff62615 AUX lxd-5.0.2-r1.initd 1710 BLAKE2B a9597d32e88502f521f3ae784e4f653ab6d3ab144537b27f5e9b84eb36e5688b13d74968c865153d6e442f77a67b5794fb429705bea8b40cdef00768102de55b SHA512 73ea4aaee39061565524a378b9317bee4b850f0c28ae3f8a47e905b9dffc4452e71736880391bb74b88ea70bda12874699a1eff56400ac9d7949738f3aa3ebce AUX lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch 1059 BLAKE2B 2f75a4825584bfb864702f6d5b7023850ca19601014a0f594c2909b892c94b355013eac32d430caf7600e3fdc85fe5140d1e01bd6c26d3cb80df52ccf5cb3ee2 SHA512 026847b13dee7b92e718ea4c6697483d115cc452a9f129acedf7aa8df78f9f67c2b9ff72bec959560d1baabce9d5cf8c9b791fbd5b829cca18a488e8572e6872 AUX lxd-5.0.3-btrfs-quota-group-fix.patch 1762 BLAKE2B c26a2cfe479cace5dda6bccf09c4c67d5e787fb0595da58959c182ec866b7a22ebed11856b29feb77a24d4b44fed213dae649f3b74fd55f6211c8c98f3a8d55d SHA512 0438c12eb728a968ec80562e6ca839ab14cb7c09294ae527a8e20e24e927e8941f87ffc8a145f4931bb8867f5ad2cdf61c965f29f0320e5716aa387dbd3e5880 -AUX lxd-5.17-remove-shellcheck-buildsystem-checks.patch 988 BLAKE2B a6d1d72af01a645c8bc129e377273f53cd2e95729f00623597fd161bf3fd7d86bb053eb9e09062c356bc0447c79d0ae5d2da9351123d8c96df0098fca3079d8a SHA512 4e4853dca86e4ac7c3c7c4ed4cf35f0850cfae50839b3a51f17046390277585d24d3cc9a128fc5821b0b19b50b04cab2c301fec3c7b1794ccd8953e262cbd3c2 AUX lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch 910 BLAKE2B 60fec0f3bf05a9955c0682a623dc4492626bda0fa4fc9ab78fcdb8d842ec53ff3ce51ad11dab71f12fe5bc03df9977cfac3e1a0087439bf3d056045954dba422 SHA512 307bc002271c3cb0013c59ec23b6f58ce5abf33b9b68dbd89dc41d3d4474ac4633269a8707033f24182b3debe77c5ac9a5003b53de38e023d22c6465b25ceee2 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 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 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b SHA512 e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc -DIST lxd-5.17.tar.gz 22319517 BLAKE2B b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe SHA512 f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf -DIST lxd-5.17.tar.gz.asc 833 BLAKE2B bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2 SHA512 7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c DIST lxd-5.18.tar.gz 22536474 BLAKE2B 44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b SHA512 a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f2222905232231997a8f47fa097ed603d93dde2b9990b3e7018103f DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e SHA512 959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2 +DIST lxd-5.19.tar.gz 22506800 BLAKE2B 94940a9e886d005495f8888d4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386 SHA512 11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f +DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1 SHA512 2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed EBUILD lxd-4.0.9-r4.ebuild 4918 BLAKE2B a73d9a490af4525dbdcbb41d36c9f21ce8d9f7b0a499c248f3fd49f36cbdf130bbcab030326b44e8d7e19f9af3491ff444488b4a59b839b3913c7bdd1b18fdeb SHA512 5d85bdea57788475816054d857e70b1eebea4d3ce540f9da45437d69645d9424d51b38f6d4bf4e65a742a7b57454f9b2f102c67b537fbfe5377674464691bbc7 -EBUILD lxd-5.0.2-r3.ebuild 5892 BLAKE2B e482d3b6cefbb3fab694e51c7148b5926164fe616cb2fb1dcd5f5f62f60e421166f77c68e754e374235a033922194bdc6431dc2373261a3e20cdb67659d9cd65 SHA512 6fd85415d8aa08fac445b22dcc66b3342bba44a6f2968c237ac2160cddfefb0042162c745c3c7c8587f25d1d070fd6a3afb08541df76e2ab275f02629a029679 -EBUILD lxd-5.17.ebuild 5078 BLAKE2B 14bfe4e98d5aeee4978a5d50300ceeaa266320a4a5315719eeabe5e52055346d127f3d56ee49ea76b495f7ccb4aaaf61595d62a8572b33d45c94183685bcd813 SHA512 0e106aa4baeba39214e4dc200ef39e4c301e695b5224f0b18feb4a1e5f97c57a944afc9f0d6a516ab6c46d52279bdc3694ee78f663446f0efb4ab9613c0a4be6 -EBUILD lxd-5.18.ebuild 5087 BLAKE2B 8ff739e3e1ca856ac6eb01ad1ad908b03cc2a765303d7441c0127f84d149da02018ab51f0d71efef71821a6b9a74ca71ce976526716fc70db50a47bcc3bcaf01 SHA512 bb83837e2982ee6ab5bf7f154e3fe9f590a8b91ae24af8a3cec2f6bf706654cc9d010e143ed23f55e90fe19513a1d116abec317dafa48735afbe2f9f418cb21b +EBUILD lxd-5.0.2-r3.ebuild 5907 BLAKE2B ff1ba27079e01a80652265c89e1551377957b913ce69f183731114650b92052f78ce9f5ba4c34c52f9d62879f787102083ebd5a408abf98fbdf80b696cfa3a04 SHA512 025f0999a10310b2ba5be7ce73272e7f318d399d2281d4735fc9416f1c7e4fa3649804cc7ae51f11a79ad16425d0714730033210fa0a4f543db327a6dd92f11c +EBUILD lxd-5.18.ebuild 5102 BLAKE2B ea319ac4f9b68a1426a84d50af27b4e9c20fd0d03ff3b709a98d338c7726eac6ed74bcf28f7ce85a435f079da97320e16b17ef254b206f66e20dfb85e58e3893 SHA512 c0f409a615f7e242c4c4b473986809e0fb380a54a95d40812986fa91eb30d72bf49b7cf892a13c6158bed0b09d76bad9115c04a5b791aaddf51650493e07d174 +EBUILD lxd-5.19.ebuild 5013 BLAKE2B 9340215a62aab2dc43649015025f77111de11496fe9fee319c268e8cca059e90defdbdb7d456f037169c354dc917f32c06747f84e7c0268d1e726d67bca3c839 SHA512 7d144cf18c515a94dda3b130c52c55784292a4fb2791c65d3641942f5c10eb9edb0392777a5f8bbfe6e11a113078fde10bb6428f1b17c5527a784be4fe1405c2 MISC metadata.xml 1542 BLAKE2B 5dd8be7c1a6c3207c5ea702c82ee8dc647663f28feb99ad8d0df7d0cabad9f5e5a99b3a5366a305fc06b4aa3228a9648cbc4a5e69a2a6f0f162944570e20b1ff SHA512 5e019f57f6bbe4ebf47fc4affe1c0a7bb15affda5d2445072f8e7b7998dadec390b077a63c2836a0dff57e055c5108686b547c8687310661be66dded52767854 diff --git a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch b/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch deleted file mode 100644 index b0e3a7500b89..000000000000 --- a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -249,28 +249,6 @@ endif - .PHONY: build-mo - build-mo: $(MOFILES) - --.PHONY: static-analysis --static-analysis: --ifeq ($(shell command -v golangci-lint),) -- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin --endif --ifeq ($(shell command -v shellcheck),) -- echo "Please install shellcheck" -- exit 1 --endif --ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0" -- @echo "WARN: shellcheck version is not 0.8.0" --endif --ifeq ($(shell command -v flake8),) -- echo "Please install flake8" -- exit 1 --endif -- golangci-lint run --timeout 5m -- flake8 test/deps/import-busybox -- shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh test/backends/*.sh test/lint/*.sh -- shellcheck test/extras/*.sh -- run-parts --exit-on-error --regex '.sh' test/lint -- - .PHONY: tags - tags: *.go lxd/*.go shared/*.go lxc/*.go - find . -type f -name '*.go' | xargs gotags > tags diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild b/app-containers/lxd/lxd-5.0.2-r3.ebuild index 8d110b892d9d..f0c1f274db2c 100644 --- a/app-containers/lxd/lxd-5.0.2-r3.ebuild +++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild @@ -182,7 +182,7 @@ pkg_postinst() { optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] optfeature "btrfs storage backend" sys-fs/btrfs-progs optfeature "ipv6 support" net-dns/dnsmasq[ipv6] - optfeature "full lxd-migrate support" + optfeature "full lxd-migrate support" net-misc/rsync optfeature "lvm2 storage backend" sys-fs/lvm2 optfeature "zfs storage backend" sys-fs/zfs elog diff --git a/app-containers/lxd/lxd-5.17.ebuild b/app-containers/lxd/lxd-5.17.ebuild deleted file mode 100644 index ea17b562f52c..000000000000 --- a/app-containers/lxd/lxd-5.17.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig - -DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" -HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd" -SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz - verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc -)" - -LICENSE="Apache-2.0 BSD LGPL-3 MIT" -SLOT="0/stable" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="apparmor nls" - -DEPEND="acct-group/lxd - app-arch/xz-utils - >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)] - dev-db/sqlite:3 - >=dev-libs/dqlite-1.13.0:= - dev-libs/lzo - >=dev-libs/raft-0.17.1:=[lz4] - >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp] - sys-libs/libcap - virtual/udev" -RDEPEND="${DEPEND} - || ( - net-firewall/nftables[json] - ( - net-firewall/ebtables - net-firewall/iptables - ) - ) - sys-apps/iproute2 - sys-fs/fuse:3 - >=sys-fs/lxcfs-5.0.0 - sys-fs/squashfs-tools[lzma] - virtual/acl" -BDEPEND="dev-lang/go - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-canonical )" - -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-migrate - /usr/sbin/lxd" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/canonical.asc - -# The testsuite must be run as root. -# make: *** [Makefile:156: check] Error 1 -RESTRICT="test" - -GOPATH="${S}/_dist" - -PATCHES=( - "${FILESDIR}"/lxd-5.17-remove-shellcheck-buildsystem-checks.patch -) - -src_prepare() { - export GOPATH="${S}/_dist" - - default - - 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.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/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." - - cp "${FILESDIR}"/lxd-4.0.9-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 - - # Disable -Werror's from go modules. - find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die -} - -src_configure() { :; } - -src_compile() { - export GOPATH="${S}/_dist" - export CGO_LDFLAGS_ALLOW="-Wl,-z,now" - - for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do - go install -v -x "${S}/${k}" || die "failed compiling ${k}" - done - - go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon" - - # Needs to be built statically - CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate - CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent - - use nls && emake build-mo -} - -src_test() { - emake check -} - -src_install() { - export GOPATH="${S}/_dist" - local bindir="_dist/bin" - - dosbin ${bindir}/lxd - - for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do - dobin ${bindir}/${l} - done - - newbashcomp scripts/bash/lxd-client lxc - - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd - newinitd "${FILESDIR}"/lxd-5.0.2-r1.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 - - dodoc AUTHORS - dodoc -r 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 "ipv6 support" net-dns/dnsmasq[ipv6] - optfeature "full lxd-migrate support" - 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/lxd-5.18.ebuild b/app-containers/lxd/lxd-5.18.ebuild index a7b9cee3c03f..d4b3da597693 100644 --- a/app-containers/lxd/lxd-5.18.ebuild +++ b/app-containers/lxd/lxd-5.18.ebuild @@ -184,7 +184,7 @@ pkg_postinst() { optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] optfeature "btrfs storage backend" sys-fs/btrfs-progs optfeature "ipv6 support" net-dns/dnsmasq[ipv6] - optfeature "full lxd-migrate support" + optfeature "full lxd-migrate support" net-misc/rsync optfeature "lvm2 storage backend" sys-fs/lvm2 optfeature "zfs storage backend" sys-fs/zfs elog diff --git a/app-containers/lxd/lxd-5.19.ebuild b/app-containers/lxd/lxd-5.19.ebuild new file mode 100644 index 000000000000..681eaf740cbf --- /dev/null +++ b/app-containers/lxd/lxd-5.19.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig + +DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" +HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd" +SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz + verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc +)" + +LICENSE="Apache-2.0 BSD LGPL-3 MIT" +SLOT="0/stable" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="apparmor nls" + +DEPEND="acct-group/lxd + app-arch/xz-utils + >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)] + dev-db/sqlite:3 + >=dev-libs/dqlite-1.13.0:= + dev-libs/lzo + >=dev-libs/raft-0.17.1:=[lz4] + >=dev-util/xdelta-3.0[lzma(+)] + net-dns/dnsmasq[dhcp] + sys-libs/libcap + virtual/udev" +RDEPEND="${DEPEND} + || ( + net-firewall/nftables[json] + ( + net-firewall/ebtables + net-firewall/iptables + ) + ) + sys-apps/iproute2 + sys-fs/fuse:3 + >=sys-fs/lxcfs-5.0.0 + sys-fs/squashfs-tools[lzma] + virtual/acl" +BDEPEND="dev-lang/go + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-canonical )" + +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-migrate + /usr/sbin/lxd" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/canonical.asc + +# The testsuite must be run as root. +# make: *** [Makefile:156: check] Error 1 +RESTRICT="test" + +GOPATH="${S}/_dist" + +src_prepare() { + export GOPATH="${S}/_dist" + + default + + 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.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/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." + + cp "${FILESDIR}"/lxd-4.0.9-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 + + # Disable -Werror's from go modules. + find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die +} + +src_configure() { :; } + +src_compile() { + export GOPATH="${S}/_dist" + export CGO_LDFLAGS_ALLOW="-Wl,-z,now" + + for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do + go install -v -x "${S}/${k}" || die "failed compiling ${k}" + done + + go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon" + + # Needs to be built statically + CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate + CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent + + use nls && emake build-mo +} + +src_test() { + emake check +} + +src_install() { + export GOPATH="${S}/_dist" + local bindir="_dist/bin" + + dosbin ${bindir}/lxd + + for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do + dobin ${bindir}/${l} + done + + newbashcomp scripts/bash/lxd-client lxc + + newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd + newinitd "${FILESDIR}"/lxd-5.0.2-r1.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 + + dodoc AUTHORS + dodoc -r 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 "ipv6 support" net-dns/dnsmasq[ipv6] + optfeature "full lxd-migrate support" net-misc/rsync + 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." +} -- cgit v1.2.3