summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2023-03-03 08:40:04 +0200
committerJoonas Niilola <juippis@gentoo.org>2023-03-03 09:14:58 +0200
commitc6f02344816966e98f4f41d014b30855e9355410 (patch)
tree8eca716d97dd699bbce25dc633c08a53fe35b96c /app-containers
parentmedia-libs/libdiscid: bump to 0.6.4, dropped 0.6.3 (diff)
downloadgentoo-c6f02344816966e98f4f41d014b30855e9355410.tar.gz
gentoo-c6f02344816966e98f4f41d014b30855e9355410.tar.bz2
gentoo-c6f02344816966e98f4f41d014b30855e9355410.zip
app-containers/lxd: drop 5.0.1-r7
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-containers')
-rw-r--r--app-containers/lxd/Manifest4
-rw-r--r--app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch27
-rw-r--r--app-containers/lxd/lxd-5.0.1-r7.ebuild217
3 files changed, 0 insertions, 248 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index fd079b683160..7a4e3af6d38c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,8 +1,4 @@
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.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
-DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
-DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 BLAKE2B 4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed SHA512 266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7
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.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e SHA512 5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9
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
deleted file mode 100644
index c6cf6c97b013..000000000000
--- a/app-containers/lxd/files/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 37779fd75dbcd02fab03a8327a1ec7a6f3273371 Mon Sep 17 00:00:00 2001
-From: Thomas Parrott <thomas.parrott@canonical.com>
-Date: Wed, 4 Jan 2023 09:59:37 +0000
-Subject: [PATCH] lxd/storage/drivers/driver/btrfs/utils: Fix getQGroup to
- suport BTRFS >= 6.0.1
-
-Fixes #11210
-
-Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
----
- lxd/storage/drivers/driver_btrfs_utils.go | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go
-index 8f0846d2fc9f..e1468e4b1a59 100644
---- a/lxd/storage/drivers/driver_btrfs_utils.go
-+++ b/lxd/storage/drivers/driver_btrfs_utils.go
-@@ -247,7 +247,8 @@ func (d *btrfs) getQGroup(path string) (string, int64, error) {
- var qgroup string
- usage := int64(-1)
- for _, line := range strings.Split(output, "\n") {
-- if line == "" || strings.HasPrefix(line, "qgroupid") || strings.HasPrefix(line, "---") {
-+ // Use case-insensitive field title match because BTRFS tooling changed casing between versions.
-+ if line == "" || strings.HasPrefix(strings.ToLower(line), "qgroupid") || strings.HasPrefix(line, "-") {
- continue
- }
-
diff --git a/app-containers/lxd/lxd-5.0.1-r7.ebuild b/app-containers/lxd/lxd-5.0.1-r7.ebuild
deleted file mode 100644
index fb1952e6d9c7..000000000000
--- a/app-containers/lxd/lxd-5.0.1-r7.ebuild
+++ /dev/null
@@ -1,217 +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://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
- https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
- https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch -> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
- verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-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]
- sys-libs/libcap
- virtual/udev"
-RDEPEND="${DEPEND}
- net-firewall/ebtables
- net-firewall/iptables
- sys-apps/iproute2
- sys-fs/fuse:*
- >=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-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-migrate
- /usr/sbin/lxd"
-
-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"
-
-GOPATH="${S}/_dist"
-
-PATCHES=( "${DISTDIR}"/lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
- "${DISTDIR}"/lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
- "${FILESDIR}"/lxd-5.0.2-fix-btrfs-driver-to-support-btrfs-6.0.patch )
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-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 "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."
-
- if [[ ${REPLACING_VERSIONS} ]] &&
- ver_test ${REPLACING_VERSIONS} -lt 5.0.1 &&
- has_version app-emulation/qemu[spice,usbredir,virtfs]; then
- ewarn ""
- ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent"
- ewarn "product, you'll have to restart any running virtual machines before they work"
- ewarn "properly."
- ewarn ""
- ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd."
- ewarn ""
- fi
-
- if [[ ${REPLACING_VERSIONS} ]] &&
- has_version "sys-apps/openrc"; then
- elog ""
- elog "The new init.d script will attempt to mount "
- elog " /sys/fs/cgroup/systemd"
- elog "by default, which is needed to run systemd containers with openrc host."
- elog "See the /etc/init.d/lxd file for requirements."
- elog ""
- fi
-}