summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2023-12-13 10:08:05 +0200
committerJoonas Niilola <juippis@gentoo.org>2023-12-13 10:09:19 +0200
commitede01cc9457106602b6f48aa9e76d06c07dd512e (patch)
tree300f6ccc8af8012b4b7ce4457f473eaaceeeaa7b
parentnet-im/synapse: lift twisted restriction (diff)
downloadgentoo-ede01cc9457106602b6f48aa9e76d06c07dd512e.tar.gz
gentoo-ede01cc9457106602b6f48aa9e76d06c07dd512e.tar.bz2
gentoo-ede01cc9457106602b6f48aa9e76d06c07dd512e.zip
app-containers/incus: add lxd-5.20 compatibility patch
- for lxd-to-incus tool. Signed-off-by: Joonas Niilola <juippis@gentoo.org>
-rw-r--r--app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch26
-rw-r--r--app-containers/incus/incus-0.3-r1.ebuild191
2 files changed, 217 insertions, 0 deletions
diff --git a/app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch b/app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch
new file mode 100644
index 000000000000..a20b40105119
--- /dev/null
+++ b/app-containers/incus/files/incus-0.3-lxd-5.20-compatibility.patch
@@ -0,0 +1,26 @@
+From 8bd2b3b3f889787de515eaea532ff728527a8788 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
+Date: Tue, 12 Dec 2023 23:12:41 -0500
+Subject: [PATCH] lxd-to-incus: Update for LXD 5.20
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
+---
+ cmd/lxd-to-incus/validate.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/lxd-to-incus/validate.go b/cmd/lxd-to-incus/validate.go
+index 8e8020ebf..0078f8793 100644
+--- a/cmd/lxd-to-incus/validate.go
++++ b/cmd/lxd-to-incus/validate.go
+@@ -13,7 +13,7 @@ import (
+ )
+
+ var minLXDVersion = &version.DottedVersion{4, 0, 0}
+-var maxLXDVersion = &version.DottedVersion{5, 19, 0}
++var maxLXDVersion = &version.DottedVersion{5, 20, 0}
+
+ func (c *cmdMigrate) validate(source Source, target Target) error {
+ srcClient, err := source.Connect()
diff --git a/app-containers/incus/incus-0.3-r1.ebuild b/app-containers/incus/incus-0.3-r1.ebuild
new file mode 100644
index 000000000000..3b29b5fe5570
--- /dev/null
+++ b/app-containers/incus/incus-0.3-r1.ebuild
@@ -0,0 +1,191 @@
+# 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.3-lxd-5.20-compatibility.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
+}