diff options
Diffstat (limited to 'app-containers/lxd')
| -rw-r--r-- | app-containers/lxd/Manifest | 2 | ||||
| -rw-r--r-- | app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch | 58 | ||||
| -rw-r--r-- | app-containers/lxd/lxd-4.0.7-r2.ebuild | 175 |
3 files changed, 0 insertions, 235 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 2295b2e0b2c5..5aa9fa7a435c 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -1,4 +1,2 @@ -DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1 -DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82 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 diff --git a/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch b/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch deleted file mode 100644 index 0b471688cc0d..000000000000 --- a/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9a128f32fc277dd0c07bc85c71dc25d123f8a831 Mon Sep 17 00:00:00 2001 -From: Christian Brauner <christian.brauner@ubuntu.com> -Date: Wed, 4 Aug 2021 21:34:11 +0200 -Subject: [PATCH] syscall_wrappers: don't conflict with glibc provided - close_range() - -Newer glibc version's provide a wrapper for close_range(). - -Fixes: #9084 -Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> ---- - lxd/include/syscall_wrappers.h | 2 +- - lxd/main_checkfeature.go | 2 +- - lxd/main_forkexec.go | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lxd/include/syscall_wrappers.h b/lxd/include/syscall_wrappers.h -index 4405a622b801..25e56a5cefac 100644 ---- a/lxd/include/syscall_wrappers.h -+++ b/lxd/include/syscall_wrappers.h -@@ -16,7 +16,7 @@ - #define CLOSE_RANGE_UNSHARE (1U << 1) - #endif - --static inline int close_range(unsigned int fd, unsigned int max_fd, unsigned int flags) -+static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags) - { - return syscall(__NR_close_range, fd, max_fd, flags); - } -diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go -index 9511b684fa5d..0cc89207158d 100644 ---- a/lxd/main_checkfeature.go -+++ b/lxd/main_checkfeature.go -@@ -496,7 +496,7 @@ static void is_close_range_aware(void) - if (fd < 0) - return; - -- if (close_range(fd, fd, CLOSE_RANGE_UNSHARE)) -+ if (lxd_close_range(fd, fd, CLOSE_RANGE_UNSHARE)) - return; - - close_range_aware = true; -diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go -index 574f25eeb988..cfa4cd6bcda8 100644 ---- a/lxd/main_forkexec.go -+++ b/lxd/main_forkexec.go -@@ -290,7 +290,7 @@ __attribute__ ((noinline)) static int __forkexec(void) - if (!argvp || !*argvp) - return log_error(EXIT_FAILURE, "No command specified"); - -- ret = close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE); -+ ret = lxd_close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE); - if (ret) { - // Fallback to close_inherited() when the syscall is not - // available or when CLOSE_RANGE_UNSHARE isn't supported. --- -2.32.0 - diff --git a/app-containers/lxd/lxd-4.0.7-r2.ebuild b/app-containers/lxd/lxd-4.0.7-r2.ebuild deleted file mode 100644 index 0d725dd9c643..000000000000 --- a/app-containers/lxd/lxd-4.0.7-r2.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# 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-libs/dqlite - dev-libs/lzo - dev-libs/raft[lz4] - >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp,ipv6?]" -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 - -PATCHES=( - "${FILESDIR}/${PN}-syscall_wrappers-don-t-conflict-with-glibc-provided.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() { - export GOPATH="${S}/_dist" - export GO111MODULE=off - go test -v ${EGO_PN}/lxd || die -} - -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." -} |