commit:     b63796659bcdbafbc03d6bc45cad15ef9b6cd1d9
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 12:49:43 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 12:49:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6379665

app-containers/lxd: drop 5.0.1-r3

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/files/lxd-5.0.2.initd |  54 --------
 app-containers/lxd/lxd-5.0.1-r3.ebuild   | 203 -------------------------------
 2 files changed, 257 deletions(-)

diff --git a/app-containers/lxd/files/lxd-5.0.2.initd 
b/app-containers/lxd/files/lxd-5.0.2.initd
deleted file mode 100644
index 575129a8f7e8..000000000000
--- a/app-containers/lxd/files/lxd-5.0.2.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 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.
-       # Create a log directory for lxd with correct permissions.
-       install -d /var/lib/lxd --group lxd --owner root --mode 0775
-       install -d /var/log/lxd --group lxd --owner root
-
-       start-stop-daemon --start \
-               --pidfile ${PIDFILE} \
-               --exec ${DAEMON} \
-               --background \
-               --make-pidfile \
-               -- \
-               ${LXD_OPTIONS}
-       eend ${?}
-
-       # Create necessary systemd paths in order for systemd containers to 
work on openrc host.
-       install -d /sys/fs/cgroup/systemd --group lxd --owner root
-       mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
-}
-
-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-containers/lxd/lxd-5.0.1-r3.ebuild 
b/app-containers/lxd/lxd-5.0.1-r3.ebuild
deleted file mode 100644
index 703f56669164..000000000000
--- a/app-containers/lxd/lxd-5.0.1-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 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 ipv6 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,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-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 )
-
-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.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 "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 [[ -n ${REPLACING_VERSIONS} ]] && 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
-}

Reply via email to