diff options
Diffstat (limited to 'app-containers/lxd')
-rw-r--r-- | app-containers/lxd/Manifest | 4 | ||||
-rw-r--r-- | app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch | 21 | ||||
-rw-r--r-- | app-containers/lxd/lxd-5.18.ebuild | 192 |
3 files changed, 0 insertions, 217 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 670962947ded..6e97df1a028b 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -6,18 +6,14 @@ 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.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.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 4910 BLAKE2B e49519f08b5214bf26ac9859f4fc514361aae85f6e6ac9bc80463e23b54547ce724682eba8dcbf34bb9a024d615f58fc717b20612c2a97db4c974b339df7cad1 SHA512 85b77939031b81a5bfa544d04b2274ed45abb6337faa0db9bde6a6ac4624230b5c69eb469ae1035e7e79a2219e0d4538d07122cf5c803a90c6ae5df26f1bce5b EBUILD lxd-5.0.2-r3.ebuild 5899 BLAKE2B b4e6beb45164e5bed163cba3bf1cd12d5431ce32d1bf009a4d4b698da08d95f933e18d19b774ea480e5ca0ad3164b1ec1c316ca7a4fc88109aea033382cf326f SHA512 e264f5fc588460fa670bba08cb22e8dbba1cd42aa0dc72414a4893e299d8ec50f7733880b8605374755e0ff26b3b45a03e3d46ae1b6fd3cd815f32f0408b35f1 -EBUILD lxd-5.18.ebuild 5094 BLAKE2B 348b1f81fe13aa23dd36bef7503d367414e726d29452300df0a65b17e7f1d9b7c50222901e64844587cf177083e7acf16b832c0e6eb0619967236bd4d8f3b1b5 SHA512 57293c46cd66ae99058d8bb607b1919ea89ecb15100e2852dcc60757f6e78cc961cc5d833a6eccdead03b9c56601d9735fc95c13288527db6aae6623de3d0c42 EBUILD lxd-5.19.ebuild 5005 BLAKE2B a371a53672b07efa199bae9495f04053898a9c970e371492f5043c5e992b786411fa9a3d8a8a0484abb3e8332edf01f25334b282cc92ebe57b9756fe55caea39 SHA512 87ffbcc2800fad290c9d95ed654b56e2ac8341863c01555c34d524a49877d47f32abd12bda30cbbca6eabd9bc5129c0219319c0e1afd6b35f41b65b455931c0e MISC metadata.xml 1607 BLAKE2B efd749f3764c659858a53c597b47ed2d6d6bb33e8c15700f01eedb9b78ea925ce8aa27578249b190be1da52b3855b895445bf866ddb8d5bb13db5daf2d0027a8 SHA512 e9d1ca983014ec8ac8ce8b1635d2b2cda308c615650c1350a09bd40870b2bde0c771fb7577d1e949bd73cf9c340a44b63a638b15ef66d93d947105edb1f4c46d diff --git a/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch b/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch deleted file mode 100644 index 025a9e6a8e6c..000000000000 --- a/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/canonical/lxd/commit/2d8481712055d0cbb3bd952e25a1df469939990d.patch -From: Thomas Parrott <thomas.parrott@canonical.com> -Date: Thu, 21 Sep 2023 22:12:19 +0100 -Subject: [PATCH] shared/simplestreams/products: Fix regression in - lxd_combined.tar.gz handling - -For reasons that are likely lost to history simplestreams uses lxd.tar.xz -whereas the combined file is lxd_combined.tar.gz (not xz). - -Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com> ---- a/shared/simplestreams/products.go -+++ b/shared/simplestreams/products.go -@@ -10,7 +10,7 @@ import ( - "github.com/canonical/lxd/shared/osarch" - ) - --var lxdCompatCombinedItems = []string{"lxd_combined.tar.xz", "incus_combined.tar.xz"} -+var lxdCompatCombinedItems = []string{"lxd_combined.tar.gz", "incus_combined.tar.gz"} - var lxdCompatItems = []string{"lxd.tar.xz", "incus.tar.xz"} - - // Products represents the base of download.json. diff --git a/app-containers/lxd/lxd-5.18.ebuild b/app-containers/lxd/lxd-5.18.ebuild deleted file mode 100644 index 4dd097200fa7..000000000000 --- a/app-containers/lxd/lxd-5.18.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=/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}"/${P}-handle-regression-in-lxd_combined.tar.gz-handling.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" 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." -} |