commit: a1352d545ad07c3b23775bb7e73b5d90da0e598d Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Fri Dec 8 06:46:46 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Dec 8 06:46:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1352d54
app-containers/incus: drop 0.2-r1 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-containers/incus/Manifest | 2 - .../incus-0.2-lxd-to-incus-openrc-support.patch | 71 -------- app-containers/incus/incus-0.2-r1.ebuild | 191 --------------------- 3 files changed, 264 deletions(-) diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest index 2ca38764f6e5..25ce019f4241 100644 --- a/app-containers/incus/Manifest +++ b/app-containers/incus/Manifest @@ -1,4 +1,2 @@ -DIST incus-0.2.tar.xz 13248036 BLAKE2B 1b83fc3498d5c31984053e000b9d63846aa6a9087158720eb5a25a8c3bd8cd0ab97391334622612b62d9c8aef145f45668f31abfa25e993b959d1609b0af1694 SHA512 0f2656e41faf9e020392f39a012a6ab64a6683894b2e463fac6bf6a2c2bb55280d454e5b4c23ab23526517a0b2b3c66c7b9a6d5f9477ca0848347a8534ea5eec -DIST incus-0.2.tar.xz.asc 833 BLAKE2B 834f9adaea11a85e0a03c75edaadfd226b3be57c49015c2ba7b4fe021b9e8b2e403b5f11e6a482dd1f024456ef4e0bf3145ce15c9f5b0a26954410a2fdac6f9f SHA512 ab55dbbc450b24429e77d816eddee541ebc8453a71704d1ec003a7b0d12a192faab438f6cfe82e90889d845dfaf9a5e9ea2b8d596198e19adbffb106a326000c DIST incus-0.3.tar.xz 13344380 BLAKE2B 8160843df4ff419ef8890fcdd6b6b7e2c3cdec509ae072ec195c2b2c44e61ab3dc20a0488e9023d891b7ee2f2c700cfb8206ebe29236c29705a7121e5436d64f SHA512 d3f3141f72a8ecf007faca8c2f2d1465d766d12f763e714d296fd28acd7e3095dd49834d428f42bf142e301cf1af7ee00ef74005d128c49aa147fb4d9348dbde DIST incus-0.3.tar.xz.asc 833 BLAKE2B 532ee90f3ed1d4798a19dcc9df8fe6587ab5ab93d18accae7aae8e44cb8c8086c77702a572a371a966eee4ebed84a2d7941f52001152a1894e1d74aa235a06e0 SHA512 afd2aab52a19b618d194eab71974f84d1d3eb9639b2672d8e94153ac23b05764667374504b5f1355238341c4194de282d3bc7635335375fd347ba513eb66e685 diff --git a/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch b/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch deleted file mode 100644 index 9ab26752f9f8..000000000000 --- a/app-containers/incus/files/incus-0.2-lxd-to-incus-openrc-support.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 73f22c10770ba07ffe55e37480c5d50beb3c0c35 Mon Sep 17 00:00:00 2001 -From: xsoalokinx <[email protected]> -Date: Sun, 29 Oct 2023 07:42:02 +0000 -Subject: [PATCH] cmd/lxd-to-incus: Add OpenRC target support - -Signed-off-by: xsoalokinx <[email protected]> ---- - cmd/lxd-to-incus/targets.go | 46 ++++++++++++++++++++++++++++++++++++- - 1 file changed, 45 insertions(+), 1 deletion(-) - -diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go -index ed84d3ebc..0940e1597 100644 ---- a/cmd/lxd-to-incus/targets.go -+++ b/cmd/lxd-to-incus/targets.go -@@ -16,7 +16,7 @@ type Target interface { - Paths() (*DaemonPaths, error) - } - --var targets = []Target{&targetSystemd{}} -+var targets = []Target{&targetSystemd{}, &targetOpenRC{}} - - type targetSystemd struct{} - -@@ -61,3 +61,47 @@ func (s *targetSystemd) Paths() (*DaemonPaths, error) { - Cache: "/var/cache/incus/", - }, nil - } -+ -+type targetOpenRC struct{} -+ -+func (s *targetOpenRC) Present() bool { -+ if !util.PathExists("/var/lib/incus/") { -+ return false -+ } -+ -+ _, err := subprocess.RunCommand("rc-service", "--exists", "incus") -+ if err != nil { -+ return false -+ } -+ -+ return true -+} -+ -+func (s *targetOpenRC) Stop() error { -+ _, err := subprocess.RunCommand("rc-service", "incus", "stop") -+ return err -+} -+ -+func (s *targetOpenRC) Start() error { -+ _, err := subprocess.RunCommand("rc-service", "incus", "start") -+ if err != nil { -+ return err -+ } -+ -+ // Wait for the socket to become available. -+ time.Sleep(5 * time.Second) -+ -+ return nil -+} -+ -+func (s *targetOpenRC) Connect() (incus.InstanceServer, error) { -+ return incus.ConnectIncusUnix("/var/lib/incus/unix.socket", nil) -+} -+ -+func (s *targetOpenRC) Paths() (*DaemonPaths, error) { -+ return &DaemonPaths{ -+ Daemon: "/var/lib/incus/", -+ Logs: "/var/log/incus/", -+ Cache: "/var/cache/incus/", -+ }, nil -+} diff --git a/app-containers/incus/incus-0.2-r1.ebuild b/app-containers/incus/incus-0.2-r1.ebuild deleted file mode 100644 index b5f6d80e988f..000000000000 --- a/app-containers/incus/incus-0.2-r1.ebuild +++ /dev/null @@ -1,191 +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/incus/introduction/ https://github.com/lxc/incus"; -SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz - verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )" - -LICENSE="Apache-2.0 BSD LGPL-3 MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="apparmor nls" - -DEPEND="acct-group/incus - acct-group/incus-admin - app-arch/xz-utils - >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)] - dev-db/sqlite:3 - dev-libs/cowsql - 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/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/incus - /usr/bin/lxc-to-incus - /usr/bin/incus-agent - /usr/bin/incus-benchmark - /usr/bin/incus-migrate - /usr/sbin/lxd-to-incus - /usr/sbin/incusd" - -VERIFY_SIG_OPENPGP_KEY_PATH=/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=( "${FILESDIR}"/incus-0.2-lxd-to-incus-openrc-support.patch ) - -src_prepare() { - export GOPATH="${S}/_dist" - - default - - sed -i \ - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus: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 \ - internal/server/apparmor/instance.go \ - internal/server/apparmor/instance_qemu.go \ - internal/server/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" \ - internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." - - cp "${FILESDIR}"/incus-0.1.service "${T}"/incus.service || die - if use apparmor; then - sed -i \ - '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ - "${T}"/incus.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" - - # fuidshift should be packaged for incus-lts, making it conflict with lxd. - for k in incus-benchmark incus-user incus lxc-to-incus ; do - ego install -v -x "${S}/cmd/${k}" - done - - ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd - - # Needs to be built statically - CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate - CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent - - cd "${S}"/cmd/lxd-to-incus || die - ego build -v -x ./ - cd "${S}" || die - - use nls && emake build-mo -} - -src_test() { - emake check -} - -src_install() { - export GOPATH="${S}/_dist" - local bindir="_dist/bin" - - dosbin ${bindir}/incusd - dosbin cmd/lxd-to-incus/lxd-to-incus - - for l in incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do - dobin ${bindir}/${l} - done - - dobashcomp scripts/bash/incus - - newconfd "${FILESDIR}"/incus-0.1.confd incus - newinitd "${FILESDIR}"/incus-0.1.initd incus - - systemd_dounit "${T}"/incus.service - systemd_newunit "${FILESDIR}"/incus-containers-0.1.service incus-containers.service - systemd_newunit "${FILESDIR}"/incus-0.1.socket incus.socket - - dodoc AUTHORS - dodoc -r doc/* - use nls && domo po/*.mo -} - -pkg_postinst() { - elog - elog "Please see" - elog " https://linuxcontainers.org/incus/introduction/"; - elog " https://linuxcontainers.org/incus/docs/main/tutorial/first_steps/"; - elog " https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/"; - elog "before a Gentoo Wiki page is made." - 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 incus-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 incus group." - elog -}
