From 1ae0a95cb667d85305fcc59d36fdb084a0369995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 21 Dec 2021 17:23:58 +0100 Subject: app-emulation/lxd: remove as it is in upstream --- app-emulation/lxd/Manifest | 2 - app-emulation/lxd/files/lxd-4.0.0.confd | 23 --- app-emulation/lxd/files/lxd-4.0.0.initd | 47 ------ app-emulation/lxd/files/lxd-4.0.0.socket | 12 -- app-emulation/lxd/files/lxd-4.0.7-no-werror.patch | 108 ------------- app-emulation/lxd/files/lxd-4.0.7-r1.service | 20 --- .../lxd/files/lxd-containers-4.0.0.service | 16 -- app-emulation/lxd/lxd-4.20-r1.ebuild | 177 --------------------- app-emulation/lxd/metadata.xml | 24 --- 9 files changed, 429 deletions(-) delete mode 100644 app-emulation/lxd/Manifest delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.confd delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.initd delete mode 100644 app-emulation/lxd/files/lxd-4.0.0.socket delete mode 100644 app-emulation/lxd/files/lxd-4.0.7-no-werror.patch delete mode 100644 app-emulation/lxd/files/lxd-4.0.7-r1.service delete mode 100644 app-emulation/lxd/files/lxd-containers-4.0.0.service delete mode 100644 app-emulation/lxd/lxd-4.20-r1.ebuild delete mode 100644 app-emulation/lxd/metadata.xml diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest deleted file mode 100644 index 4674301..0000000 --- a/app-emulation/lxd/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST lxd-4.20.tar.gz 11506096 BLAKE2B c3ae5a2378442855d9c5a6ffc598f0dd4b8948e2dd60aa1a383221f11e5b3f9ca679c172c97fbf94b00c17fe1be1289ca2b7ec6ecdbbe0296795c3e2e66e6d44 SHA512 af8639e93f719a6aa1e37e7dafb5c221230470eb7a565422e6d1f6540e1d4250c00549831a17abbf3d4252bd473b71469bbbc93c7afcde68704d6a401967ed72 -DIST lxd-4.20.tar.gz.asc 833 BLAKE2B 316f9862a76f07acdee4ed81be9f3c98d567f058fd9e1406c5ea8539d390075d554254a7b5b8054443b9fb1bf5cb038c8df4361982958f1c5767cdee4ddc5f41 SHA512 450f89cb871a080f738acfa6974fc6dc30fe8dc53df0cd0312df78d94417832d3423c0217989bfb45003a545088636a3c5b91b0aa67a552701988cd8731c981e diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd b/app-emulation/lxd/files/lxd-4.0.0.confd deleted file mode 100644 index 68cf344..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.confd +++ /dev/null @@ -1,23 +0,0 @@ -# Group which owns the shared socket -LXD_OPTIONS+=" --group lxd" - -# Enable cpu profiling into the specified file -#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile" - -# Enable memory profiling into the specified file -#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile" - -# Enable debug mode -#LXD_OPTIONS+=" --debug" - -# For debugging, print a complete stack trace every n seconds -#LXD_OPTIONS+=" --print-goroutines-every 5" - -# Enable verbose mode -#LXD_OPTIONS+=" -v" - -# Logfile to log to -#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log" - -# Enable syslog logging -#LXD_OPTIONS+=" --syslog" diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd deleted file mode 100644 index e6ae971..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -DAEMON=/usr/sbin/lxd -PIDFILE=/run/lxd.pid - -depend() { - need net - need lxcfs -} - -start() { - ebegin "Starting lxd service" - - modprobe -f loop > /dev/null 2>&1 - - # fix permissions on /var/lib/lxd and make sure it exists - install -d /var/lib/lxd --group lxd --owner root --mode 0775 - start-stop-daemon --start \ - --pidfile ${PIDFILE} \ - --exec ${DAEMON} \ - --background \ - --make-pidfile \ - -- \ - ${LXD_OPTIONS} - eend ${?} -} - -stop() { - if [ "${RC_CMD}" = restart ]; then - ebegin "Stopping lxd service (but not containers)" - # start-stop-daemon sends SIGTERM with a timeout of 5s by default. - # SIGTERM indicates to LXD that it will be stopped temporarily. - # Instances will keep running. - start-stop-daemon --stop --quiet -p "${PIDFILE}" - eend ${?} - else - ebegin "Stopping lxd service and containers, waiting 40s" - # SIGPWR indicates to LXD that the host is going down. - # LXD will do a clean shutdown of all instances. - # After 30s all remaining instances will be killed. - # We wait up to 40s for LXD. - start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}" - eend ${?} - fi -} diff --git a/app-emulation/lxd/files/lxd-4.0.0.socket b/app-emulation/lxd/files/lxd-4.0.0.socket deleted file mode 100644 index 3207c94..0000000 --- a/app-emulation/lxd/files/lxd-4.0.0.socket +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LXD - unix socket -Documentation=man:lxd(1) - -[Socket] -ListenStream=/var/lib/lxd/unix.socket -SocketGroup=lxd -SocketMode=0660 -Service=lxd.service - -[Install] -WantedBy=sockets.target diff --git a/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch b/app-emulation/lxd/files/lxd-4.0.7-no-werror.patch deleted file mode 100644 index 50a9163..0000000 --- a/app-emulation/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-emulation/lxd/files/lxd-4.0.7-r1.service b/app-emulation/lxd/files/lxd-4.0.7-r1.service deleted file mode 100644 index f1e644b..0000000 --- a/app-emulation/lxd/files/lxd-4.0.7-r1.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=LXD - main daemon -After=network-online.target lxcfs.service lxd.socket -Requires=network-online.target lxcfs.service lxd.socket -Documentation=man:lxd(1) - -[Service] -EnvironmentFile=-/etc/environment -ExecStart=/usr/sbin/lxd --group lxd --syslog -ExecStartPost=/usr/sbin/lxd waitready --timeout=600 -KillMode=process -TimeoutStartSec=600s -TimeoutStopSec=30s -Restart=on-failure -LimitNOFILE=1048576 -LimitNPROC=infinity -TasksMax=infinity - -[Install] -Also=lxd-containers.service lxd.socket diff --git a/app-emulation/lxd/files/lxd-containers-4.0.0.service b/app-emulation/lxd/files/lxd-containers-4.0.0.service deleted file mode 100644 index 894760c..0000000 --- a/app-emulation/lxd/files/lxd-containers-4.0.0.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=LXD - container startup/shutdown -Documentation=man:lxd(1) -After=lxd.socket lxd.service -Requires=lxd.socket - -[Service] -Type=oneshot -ExecStart=/usr/sbin/lxd activateifneeded -ExecStop=/usr/sbin/lxd shutdown -TimeoutStartSec=600s -TimeoutStopSec=600s -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/app-emulation/lxd/lxd-4.20-r1.ebuild b/app-emulation/lxd/lxd-4.20-r1.ebuild deleted file mode 100644 index 03dd311..0000000 --- a/app-emulation/lxd/lxd-4.20-r1.ebuild +++ /dev/null @@ -1,177 +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-emulation/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? ( app-crypt/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 - -# The testsuite must be run as root. -# make: *** [Makefile:156: check] Error 1 -RESTRICT="test" - -PATCHES=( "${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() { - 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 - 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." -} diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml deleted file mode 100644 index dfd1131..0000000 --- a/app-emulation/lxd/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - juippis@gentoo.org - Joonas Niilola - - - virtualization@gentoo.org - Gentoo Virtualization Project - - - Enable AppArmor support - - - By combining the speed and density of containers with - the security of traditional virtual machines, LXD is - the next-generation of container hypervisor for Linux - from Canonical. - - - lxc/lxd - - -- cgit v1.2.3