public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-01-07 13:39 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-01-07 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     862a2b98b7b8abf9062a0f562a2e7b9670e82752
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  7 13:36:01 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 13:38:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862a2b98

app-containers/lxd: fix the sed for OVMF path, add notes about vm's

 - lxd supports virtual machines through qemu which wasn't advertised
   in the ebuild.

Closes: https://bugs.gentoo.org/830612
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../lxd/{lxd-4.0.8-r1.ebuild => lxd-4.0.8-r2.ebuild}       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-4.0.8-r1.ebuild b/app-containers/lxd/lxd-4.0.8-r2.ebuild
similarity index 89%
rename from app-containers/lxd/lxd-4.0.8-r1.ebuild
rename to app-containers/lxd/lxd-4.0.8-r2.ebuild
index 11314dde35da..f33144850c9d 100644
--- a/app-containers/lxd/lxd-4.0.8-r1.ebuild
+++ b/app-containers/lxd/lxd-4.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,10 @@ CONFIG_CHECK="
 	~SECCOMP
 	~USER_NS
 	~UTS_NS
+
+	~KVM
+	~MACVTAP
+	~VHOST_VSOCK
 "
 
 ERROR_IPC_NS="CONFIG_IPC_NS is required."
@@ -55,6 +59,10 @@ 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
@@ -91,6 +99,7 @@ src_prepare() {
 		-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.go \
 		lxd/apparmor/instance_qemu.go \
 		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
 
@@ -167,9 +176,12 @@ 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


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-03-20  6:22 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-03-20  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     e11ea51fb564a5fc34769e491e887008a9bdc0df
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 06:18:36 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 06:18:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11ea51f

app-containers/lxd: stabilize 4.0.9-r2 for amd64

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

 app-containers/lxd/lxd-4.0.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r2.ebuild b/app-containers/lxd/lxd-4.0.9-r2.ebuild
index 83a03cabf801..07794400df85 100644
--- a/app-containers/lxd/lxd-4.0.9-r2.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-03-21  9:31 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-03-21  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     88557686e5382ac1e164f61c72bb63a7a076a240
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 09:26:12 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 09:31:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88557686

app-containers/lxd: fix finding virtfs-proxy-helper, again

 - the code has been divided amongst different files.

Closes: https://bugs.gentoo.org/798924
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/{lxd-4.0.9-r2.ebuild => lxd-4.0.9-r3.ebuild} | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app-containers/lxd/lxd-4.0.9-r2.ebuild b/app-containers/lxd/lxd-4.0.9-r3.ebuild
similarity index 95%
rename from app-containers/lxd/lxd-4.0.9-r2.ebuild
rename to app-containers/lxd/lxd-4.0.9-r3.ebuild
index 07794400df85..aee451bed561 100644
--- a/app-containers/lxd/lxd-4.0.9-r2.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r3.ebuild
@@ -99,6 +99,11 @@ src_prepare() {
 		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 \


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-05-22  8:13 Jakov Smolić
  0 siblings, 0 replies; 48+ messages in thread
From: Jakov Smolić @ 2022-05-22  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f4d0122e067726a6657d45cb0e3d8c63da51518f
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 08:12:47 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun May 22 08:12:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d0122e

app-containers/lxd: Keyword 4.0.9-r3 arm64, #846779

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-containers/lxd/lxd-4.0.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild b/app-containers/lxd/lxd-4.0.9-r3.ebuild
index aee451bed561..094ce154dee2 100644
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-06-11  9:17 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-06-11  9:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9d7431f16c4fb0bb1c5f823578f6414bcfdbdbdc
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 09:17:14 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 09:17:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7431f1

app-containers/lxd: add 5.0.0

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

 app-containers/lxd/Manifest         |   2 +
 app-containers/lxd/lxd-5.0.0.ebuild | 180 ++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 0a5674f099fa..a408e2bad9b6 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
+DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432 SHA512 e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
+DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5 SHA512 d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0

diff --git a/app-containers/lxd/lxd-5.0.0.ebuild b/app-containers/lxd/lxd-5.0.0.ebuild
new file mode 100644
index 000000000000..c8b54efd4968
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.0.ebuild
@@ -0,0 +1,180 @@
+# 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="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 ~arm64 ~x86"
+IUSE="apparmor ipv6 nls verify-sig"
+
+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
+	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"
+
+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.secboot.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-4.0.9.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."
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-06-14 14:35 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-06-14 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     77ec2ec2e1bf05bb1b05defdabd8532324e1acb2
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 08:19:52 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 14:35:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ec2ec2

app-containers/lxd: stabilize 5.0.0 for amd64

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

 app-containers/lxd/lxd-5.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.0.ebuild b/app-containers/lxd/lxd-5.0.0.ebuild
index c8b54efd4968..04dab07a5718 100644
--- a/app-containers/lxd/lxd-5.0.0.ebuild
+++ b/app-containers/lxd/lxd-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 	net-firewall/iptables[ipv6(+)?]
 	sys-apps/iproute2[ipv6(+)?]
 	sys-fs/fuse:*
-	sys-fs/lxcfs
+	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
 	virtual/acl"
 BDEPEND="dev-lang/go


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-07-18  7:01 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-07-18  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     887d6ba405ba4da3f4e08315d60ee675214baf28
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 07:00:08 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 07:01:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=887d6ba4

app-containers/lxd: drop 4.0.9-r3

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

 app-containers/lxd/Manifest            |   2 -
 app-containers/lxd/lxd-4.0.9-r3.ebuild | 179 ---------------------------------
 2 files changed, 181 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index a408e2bad9b6..ed62839a3b77 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
-DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432 SHA512 e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
 DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5 SHA512 d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0

diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild b/app-containers/lxd/lxd-4.0.9-r3.ebuild
deleted file mode 100644
index 781b306647ce..000000000000
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module 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 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-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
-	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-p2c
-	/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"
-
-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.secboot.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-p2c
-	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-p2c 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-4.0.9.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 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."
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-08-17  6:18 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-08-17  6:18 UTC (permalink / raw
  To: gentoo-commits

commit:     5e109607c953a4b24f85acd2a0df55bc14c6e039
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 06:16:01 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 06:17:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e109607

app-containers/lxd: add 5.0.1

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

 app-containers/lxd/Manifest         |   2 +
 app-containers/lxd/lxd-5.0.1.ebuild | 180 ++++++++++++++++++++++++++++++++++++
 app-containers/lxd/metadata.xml     |  17 +++-
 3 files changed, 195 insertions(+), 4 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index ed62839a3b77..8c0c9f43f578 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,2 +1,4 @@
 DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432 SHA512 e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
 DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5 SHA512 d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0
+DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
+DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild b/app-containers/lxd/lxd-5.0.1.ebuild
new file mode 100644
index 000000000000..b761f3d0f2b8
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@@ -0,0 +1,180 @@
+# 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
+	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 verify-sig"
+
+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"
+
+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.secboot.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-4.0.9.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."
+}

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index dfd11315a93a..a666d3414c49 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -13,10 +13,19 @@
     <flag name="apparmor">Enable AppArmor support</flag>
   </use>
   <longdescription>
-    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.
+    LXD is a modern, secure and powerful system container and virtual machine manager.
+
+    It provides a unified experience for running and managing full Linux systems inside containers
+    or virtual machines. LXD supplies images for a wide number of Linux distributions and is built
+    around a very powerful, yet pretty simple, REST API. LXD scales from one instance on a single
+    machine to a cluster in a full data center rack, making it suitable for running workloads both
+    for development and in production.
+
+    LXD allows you to easily set up a system that feels like a small private cloud. You can run any
+    type of workload in an efficient way while keeping your resources optimized.
+
+    You should consider using LXD if you want to containerize different environments or run virtual
+    machines, or in general run and manage your infrastructure in a cost-effective way.
   </longdescription>
   <upstream>
     <remote-id type="github">lxc/lxd</remote-id>


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-08-19  8:45 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-08-19  8:45 UTC (permalink / raw
  To: gentoo-commits

commit:     3cb2817c7134c02d1401f282e9992823c951efde
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 08:43:06 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 08:44:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb2817c

app-containers/lxd: add a vm-related update note to 5.0.1

 - virtual machines may require a manual restart after an update to 5.0.1 due
   to incompatibilities in the lxd-agent product.

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

 app-containers/lxd/lxd-5.0.1.ebuild | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild b/app-containers/lxd/lxd-5.0.1.ebuild
index b761f3d0f2b8..3d6d3f2abe58 100644
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@@ -125,7 +125,7 @@ src_compile() {
 		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"
+	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
@@ -177,4 +177,14 @@ pkg_postinst() {
 	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
 }


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-09-19  6:06 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-09-19  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     aea9cb18ab4e1842eef97131cddc62a45fe8b3fd
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 06:06:32 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 06:06:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea9cb18

app-containers/lxd: stabilize 5.0.1 for amd64

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

 app-containers/lxd/lxd-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild b/app-containers/lxd/lxd-5.0.1.ebuild
index 3d6d3f2abe58..fbff2a88cfc5 100644
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-09-24 13:57 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-09-24 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     86fe0c44cc53fe28b0c1fd377a5e49859f9faf1e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 05:59:49 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 13:57:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86fe0c44

app-containers/lxd: drop 5.0.0

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

 app-containers/lxd/Manifest         |   2 -
 app-containers/lxd/lxd-5.0.0.ebuild | 180 ------------------------------------
 2 files changed, 182 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 8c0c9f43f578..637337b043a2 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432 SHA512 e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
-DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5 SHA512 d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294

diff --git a/app-containers/lxd/lxd-5.0.0.ebuild b/app-containers/lxd/lxd-5.0.0.ebuild
deleted file mode 100644
index 04dab07a5718..000000000000
--- a/app-containers/lxd/lxd-5.0.0.ebuild
+++ /dev/null
@@ -1,180 +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="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 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-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"
-
-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.secboot.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-4.0.9.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."
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-10-12 16:40 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-10-12 16:40 UTC (permalink / raw
  To: gentoo-commits

commit:     595a3534d50588cb5fcb9f5a2be13401ed7b0f34
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 16:39:50 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 16:39:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595a3534

app-containers/lxd: fix ebuild to support secure boot with VMs

Closes: https://bugs.gentoo.org/876796
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/lxd-5.0.1-r1.ebuild | 190 +++++++++++++++++++++++++++++++++
 1 file changed, 190 insertions(+)

diff --git a/app-containers/lxd/lxd-5.0.1-r1.ebuild b/app-containers/lxd/lxd-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..d09573af7d3b
--- /dev/null
+++ b/app-containers/lxd/lxd-5.0.1-r1.ebuild
@@ -0,0 +1,190 @@
+# 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
+	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 verify-sig"
+
+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"
+
+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-4.0.9.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
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-11-12  6:23 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-11-12  6:23 UTC (permalink / raw
  To: gentoo-commits

commit:     a04b48a498a0456c5d77d3fa9ca01fda1a85f040
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 06:22:22 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 06:23:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04b48a4

app-containers/lxd: stabilize 5.0.1-r1 for amd64

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

 app-containers/lxd/lxd-5.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r1.ebuild b/app-containers/lxd/lxd-5.0.1-r1.ebuild
index d09573af7d3b..5bb5f99e42cf 100644
--- a/app-containers/lxd/lxd-5.0.1-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-11-14  7:44 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-11-14  7:44 UTC (permalink / raw
  To: gentoo-commits

commit:     2dcf85ca2e26153521ba95635bdb2e4e41e398a8
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 07:16:00 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 07:16:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcf85ca

app-containers/lxd: drop 5.0.1

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

 app-containers/lxd/lxd-5.0.1.ebuild | 190 ------------------------------------
 1 file changed, 190 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1.ebuild b/app-containers/lxd/lxd-5.0.1.ebuild
deleted file mode 100644
index fbff2a88cfc5..000000000000
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ /dev/null
@@ -1,190 +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
-	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 verify-sig"
-
-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"
-
-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.secboot.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-4.0.9.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
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2022-11-19  7:37 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2022-11-19  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9c441b542f88794137e3ad41bd9f508b8169d29f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 07:35:50 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 07:35:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c441b54

app-containers/lxd: add a subslot binder against dqlite

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

 app-containers/lxd/{lxd-5.0.1-r1.ebuild => lxd-5.0.1-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r1.ebuild b/app-containers/lxd/lxd-5.0.1-r2.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.1-r1.ebuild
rename to app-containers/lxd/lxd-5.0.1-r2.ebuild
index 5bb5f99e42cf..6ef72f36e908 100644
--- a/app-containers/lxd/lxd-5.0.1-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r2.ebuild
@@ -19,7 +19,7 @@ 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/dqlite:=
 	dev-libs/lzo
 	dev-libs/raft[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-01-10 13:25 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-01-10 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     33183001e60a019c10dda8dcbc5e89997ae5a88a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 13:24:47 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 13:24:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33183001

app-containers/lxd: drop 5.0.1-r4

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

 app-containers/lxd/lxd-5.0.1-r4.ebuild | 215 ---------------------------------
 1 file changed, 215 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r4.ebuild b/app-containers/lxd/lxd-5.0.1-r4.ebuild
deleted file mode 100644
index 9f824c73165d..000000000000
--- a/app-containers/lxd/lxd-5.0.1-r4.ebuild
+++ /dev/null
@@ -1,215 +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/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 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-r1.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 [[ ${REPLACING_VERSIONS} ]] &&
-	ver_test ${REPLACING_VERSIONS} -lt 5.0.1 &&
-	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
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-	has_version "sys-apps/openrc"; then
-		elog ""
-		elog "The new init.d script will attempt to mount "
-		elog "  /sys/fs/cgroup/systemd"
-		elog "by default, which is needed to run systemd containers with openrc host."
-		elog "See the /etc/init.d/lxd file for requirements."
-		elog ""
-	fi
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-01-10 14:03 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-01-10 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     88efb3b0ad2b4a7c102dc82265eb22cf170f8b3a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 14:03:38 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 14:03:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88efb3b0

app-containers/lxd: stabilize 5.0.1-r5 for amd64

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

 app-containers/lxd/lxd-5.0.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r5.ebuild b/app-containers/lxd/lxd-5.0.1-r5.ebuild
index 53901400ca67..86323cc0f95d 100644
--- a/app-containers/lxd/lxd-5.0.1-r5.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-01-22  7:24 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-01-22  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     89e2e41d3bdf383fece4fd8d20bb7534d16346e6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 07:20:51 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 07:24:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e2e41d

app-containers/lxd: clean old

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

 app-containers/lxd/lxd-5.0.1-r2.ebuild | 190 ---------------------------------
 1 file changed, 190 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r2.ebuild b/app-containers/lxd/lxd-5.0.1-r2.ebuild
deleted file mode 100644
index 6ef72f36e908..000000000000
--- a/app-containers/lxd/lxd-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,190 +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
-	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 verify-sig"
-
-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"
-
-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-4.0.9.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
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-01-22  7:24 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-01-22  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e088f567c2ddad70a2ca1c8a9e9c64cd2932af8c
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 07:07:19 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 07:24:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e088f567

app-containers/lxd: hint ipv6 functionality with optfeature

Closes: https://bugs.gentoo.org/891625
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/{lxd-5.0.1-r5.ebuild => lxd-5.0.1-r6.ebuild} | 7 ++++---
 app-containers/lxd/{lxd-5.0.2.ebuild => lxd-5.0.2-r1.ebuild}    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r5.ebuild b/app-containers/lxd/lxd-5.0.1-r6.ebuild
similarity index 97%
rename from app-containers/lxd/lxd-5.0.1-r5.ebuild
rename to app-containers/lxd/lxd-5.0.1-r6.ebuild
index 86323cc0f95d..944e9f88133b 100644
--- a/app-containers/lxd/lxd-5.0.1-r5.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r6.ebuild
@@ -25,13 +25,13 @@ DEPEND="acct-group/lxd
 	dev-libs/lzo
 	dev-libs/raft[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6(+)]
+	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
 	net-firewall/ebtables
-	net-firewall/iptables[ipv6(+)]
-	sys-apps/iproute2[ipv6(+)]
+	net-firewall/iptables
+	sys-apps/iproute2
 	sys-fs/fuse:*
 	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
@@ -187,6 +187,7 @@ pkg_postinst() {
 	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] net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog

diff --git a/app-containers/lxd/lxd-5.0.2.ebuild b/app-containers/lxd/lxd-5.0.2-r1.ebuild
similarity index 97%
rename from app-containers/lxd/lxd-5.0.2.ebuild
rename to app-containers/lxd/lxd-5.0.2-r1.ebuild
index 4ce69e48b15f..f361e6e12a6d 100644
--- a/app-containers/lxd/lxd-5.0.2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild
@@ -23,13 +23,13 @@ DEPEND="acct-group/lxd
 	dev-libs/lzo
 	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6(+)]
+	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
 	net-firewall/ebtables
-	net-firewall/iptables[ipv6(+)]
-	sys-apps/iproute2[ipv6(+)]
+	net-firewall/iptables
+	sys-apps/iproute2
 	sys-fs/fuse:*
 	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
@@ -175,6 +175,7 @@ pkg_postinst() {
 	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] net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-01-22 17:21 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-01-22 17:21 UTC (permalink / raw
  To: gentoo-commits

commit:     118dd8850381cac4b159027643f50b95172ea940
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 17:20:53 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 17:21:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118dd885

app-containers/lxd: update the ipv6 optfeatures

 - iproute2 and iptables should have it enabled unconditionally already.

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

 app-containers/lxd/lxd-5.0.1-r6.ebuild | 2 +-
 app-containers/lxd/lxd-5.0.2-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r6.ebuild b/app-containers/lxd/lxd-5.0.1-r6.ebuild
index 944e9f88133b..94090ea58185 100644
--- a/app-containers/lxd/lxd-5.0.1-r6.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r6.ebuild
@@ -187,7 +187,7 @@ pkg_postinst() {
 	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] net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
+	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog

diff --git a/app-containers/lxd/lxd-5.0.2-r1.ebuild b/app-containers/lxd/lxd-5.0.2-r1.ebuild
index f361e6e12a6d..71d742a84eeb 100644
--- a/app-containers/lxd/lxd-5.0.2-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild
@@ -175,7 +175,7 @@ pkg_postinst() {
 	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] net-firewall/iptables[ipv6] sys-apps/iproute2[ipv6]
+	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-02-22  6:25 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-02-22  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     453d1bf23d6300c59b8fba583417f3ffba937693
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 06:23:13 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 06:23:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453d1bf2

app-containers/lxd: revbump stable and add subslot binder for raft

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

 app-containers/lxd/{lxd-5.0.1-r6.ebuild => lxd-5.0.1-r7.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.1-r6.ebuild b/app-containers/lxd/lxd-5.0.1-r7.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.1-r6.ebuild
rename to app-containers/lxd/lxd-5.0.1-r7.ebuild
index 94090ea58185..fb1952e6d9c7 100644
--- a/app-containers/lxd/lxd-5.0.1-r6.ebuild
+++ b/app-containers/lxd/lxd-5.0.1-r7.ebuild
@@ -23,7 +23,7 @@ DEPEND="acct-group/lxd
 	dev-db/sqlite:3
 	dev-libs/dqlite:=
 	dev-libs/lzo
-	dev-libs/raft[lz4]
+	dev-libs/raft:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-02-22  7:14 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-02-22  7:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a29385a59262671a79e9fb596eab2b75d019c00e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 07:11:05 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 07:11:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29385a5

app-containers/lxd: stabilize 5.0.2-r1 for amd64

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

 app-containers/lxd/lxd-5.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r1.ebuild b/app-containers/lxd/lxd-5.0.2-r1.ebuild
index 71d742a84eeb..c71e17124ef0 100644
--- a/app-containers/lxd/lxd-5.0.2-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-03-09  6:50 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-03-09  6:50 UTC (permalink / raw
  To: gentoo-commits

commit:     6a453f8528ed2ca612f8a3ba3a7c7653e566e943
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 06:41:04 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 06:50:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a453f85

app-containers/lxd: stabilize 5.0.2-r2 for amd64

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

 app-containers/lxd/lxd-5.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 6725606f6ba2..133cbce8f682 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-03-25  6:32 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-03-25  6:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d2ec14d403f815b51e856daf28c75b8463971ebc
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 05:44:53 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 06:32:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ec14d4

app-containers/lxd: drop 5.0.2-r1

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

 app-containers/lxd/lxd-5.0.2-r1.ebuild | 205 ---------------------------------
 1 file changed, 205 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r1.ebuild b/app-containers/lxd/lxd-5.0.2-r1.ebuild
deleted file mode 100644
index c71e17124ef0..000000000000
--- a/app-containers/lxd/lxd-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,205 +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/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 BSD LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
-	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/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=( "${FILESDIR}"/lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch )
-
-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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
-	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 [[ ${REPLACING_VERSIONS} ]] &&
-	ver_test ${REPLACING_VERSIONS} -lt 5.0.1 &&
-	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
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-	has_version "sys-apps/openrc"; then
-		elog ""
-		elog "The new init.d script will attempt to mount "
-		elog "  /sys/fs/cgroup/systemd"
-		elog "by default, which is needed to run systemd containers with openrc host."
-		elog "See the /etc/init.d/lxd file for requirements."
-		elog ""
-	fi
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-06-15 12:14 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-06-15 12:14 UTC (permalink / raw
  To: gentoo-commits

commit:     40c6fc1cec1bf99653c8572db9635d4991bb2bef
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 12:13:44 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 12:13:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c6fc1c

app-containers/lxd: add new optfeature for rsync

 - provides a full lxd-migrate support.

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

 app-containers/lxd/lxd-5.0.2-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 133cbce8f682..9e5eeb783945 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -177,6 +177,7 @@ pkg_postinst() {
 	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 lxd-migrate support"
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-07-05  6:12 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-07-05  6:12 UTC (permalink / raw
  To: gentoo-commits

commit:     dfdd198d358292a3c5445451ba6671282cdf9dee
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 06:11:41 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 06:11:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdd198d

app-containers/lxd: update HOMEPAGE

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

 app-containers/lxd/lxd-5.0.2-r2.ebuild | 2 +-
 app-containers/lxd/metadata.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 9e5eeb783945..a567f5520d4e 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd"
 SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
 

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index dd209643cdb4..0367880cdf4c 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -25,6 +25,6 @@
     machines, or in general run and manage your infrastructure in a cost-effective way.
   </longdescription>
   <upstream>
-    <remote-id type="github">lxc/lxd</remote-id>
+    <remote-id type="github">canonical/lxd</remote-id>
   </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-09-10 13:23 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-09-10 13:23 UTC (permalink / raw
  To: gentoo-commits

commit:     7166d1adba75660f5a87e1411b1595157b8f2ee5
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 13:21:43 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 13:21:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7166d1ad

app-containers/lxd: revbump and add lts subslot on 4.0.9 and 5.0.2

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

 app-containers/lxd/{lxd-4.0.9-r3.ebuild => lxd-4.0.9-r4.ebuild} | 2 +-
 app-containers/lxd/{lxd-5.0.2-r2.ebuild => lxd-5.0.2-r3.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild b/app-containers/lxd/lxd-4.0.9-r4.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-4.0.9-r3.ebuild
rename to app-containers/lxd/lxd-4.0.9-r4.ebuild
index f8d5b8f837b9..246f3a898406 100644
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r4.ebuild
@@ -11,7 +11,7 @@ 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"
+SLOT="0/lts"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild b/app-containers/lxd/lxd-5.0.2-r3.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.2-r2.ebuild
rename to app-containers/lxd/lxd-5.0.2-r3.ebuild
index a567f5520d4e..3949502b2989 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -11,7 +11,7 @@ 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 BSD LGPL-3 MIT"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-09-22  8:42 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-09-22  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0ccf56f02bdc0a70367a3f06afd78f504eaf1a84
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 08:41:45 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 08:41:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccf56f0

app-containers/lxd: update maintainers

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

 app-containers/lxd/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index fd92d5b3194e..b2f6ed72c3df 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -13,10 +13,6 @@
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription>
     LXD is a modern, secure and powerful system container and virtual machine manager.
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-10-16 13:22 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-10-16 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     34661ada368076b6dfa3904d47102bad870b5595
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Mon Oct 16 11:44:40 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 13:22:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34661ada

app-containers/lxd: add missing nftables dependency

At least one functional firewall implementation has to be present at
runtime to setup a bridge network.

Closes: https://bugs.gentoo.org/915650
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/33355
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/lxd-4.0.9-r4.ebuild | 9 +++++++--
 app-containers/lxd/lxd-5.0.2-r3.ebuild | 9 +++++++--
 app-containers/lxd/lxd-5.17.ebuild     | 9 +++++++--
 app-containers/lxd/lxd-5.18.ebuild     | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r4.ebuild b/app-containers/lxd/lxd-4.0.9-r4.ebuild
index 246f3a898406..c15490e20960 100644
--- a/app-containers/lxd/lxd-4.0.9-r4.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r4.ebuild
@@ -27,8 +27,13 @@ DEPEND="acct-group/lxd
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6(+)?]
+	|| (
+			net-firewall/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables[ipv6(+)?]
+			)
+	)
 	sys-apps/iproute2[ipv6(+)?]
 	sys-fs/fuse:*
 	sys-fs/lxcfs

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild b/app-containers/lxd/lxd-5.0.2-r3.ebuild
index 3949502b2989..8d110b892d9d 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -27,8 +27,13 @@ DEPEND="acct-group/lxd
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables
+	|| (
+			net-firewall/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
 	sys-apps/iproute2
 	sys-fs/fuse:*
 	>=sys-fs/lxcfs-5.0.0

diff --git a/app-containers/lxd/lxd-5.17.ebuild b/app-containers/lxd/lxd-5.17.ebuild
index 76c54a54d503..ea17b562f52c 100644
--- a/app-containers/lxd/lxd-5.17.ebuild
+++ b/app-containers/lxd/lxd-5.17.ebuild
@@ -28,8 +28,13 @@ DEPEND="acct-group/lxd
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables
+	|| (
+			net-firewall/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
 	sys-apps/iproute2
 	sys-fs/fuse:3
 	>=sys-fs/lxcfs-5.0.0

diff --git a/app-containers/lxd/lxd-5.18.ebuild b/app-containers/lxd/lxd-5.18.ebuild
index de51e5e5b7dd..a7b9cee3c03f 100644
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -28,8 +28,13 @@ DEPEND="acct-group/lxd
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables
+	|| (
+			net-firewall/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
 	sys-apps/iproute2
 	sys-fs/fuse:3
 	>=sys-fs/lxcfs-5.0.0


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-10-19 16:06 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-10-19 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     285ccadc969f51887a9fbf74d678a7993fa44535
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Thu Oct 19 12:59:36 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 16:02:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285ccadc

app-containers/lxd: add 5.19

Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/Manifest        |   2 +
 app-containers/lxd/lxd-5.19.ebuild | 188 +++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index e1ebd6ab8100..ecf436ba8e57 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -6,3 +6,5 @@ DIST lxd-5.17.tar.gz 22319517 BLAKE2B b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a
 DIST lxd-5.17.tar.gz.asc 833 BLAKE2B bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2 SHA512 7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c
 DIST lxd-5.18.tar.gz 22536474 BLAKE2B 44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b SHA512 a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f2222905232231997a8f47fa097ed603d93dde2b9990b3e7018103f
 DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e SHA512 959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2
+DIST lxd-5.19.tar.gz 22506800 BLAKE2B 94940a9e886d005495f8888d4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386 SHA512 11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
+DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1 SHA512 2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed

diff --git a/app-containers/lxd/lxd-5.19.ebuild b/app-containers/lxd/lxd-5.19.ebuild
new file mode 100644
index 000000000000..50e2b165276b
--- /dev/null
+++ b/app-containers/lxd/lxd-5.19.ebuild
@@ -0,0 +1,188 @@
+# 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://ubuntu.com/lxd https://github.com/canonical/lxd"
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+	app-arch/xz-utils
+	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+	dev-db/sqlite:3
+	>=dev-libs/dqlite-1.13.0:=
+	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/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
+	sys-apps/iproute2
+	sys-fs/fuse:3
+	>=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-canonical )"
+
+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/canonical.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-migrate support"
+	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."
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-10-19 16:06 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-10-19 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     d9e9b91bd22cfa3744d6cebec1bae991a0bb570e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 16:03:57 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 16:03:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e9b91b

app-containers/lxd: complete optfeature for lxd-migrate

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

 app-containers/lxd/lxd-5.0.2-r3.ebuild | 2 +-
 app-containers/lxd/lxd-5.18.ebuild     | 2 +-
 app-containers/lxd/lxd-5.19.ebuild     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild b/app-containers/lxd/lxd-5.0.2-r3.ebuild
index 8d110b892d9d..f0c1f274db2c 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -182,7 +182,7 @@ pkg_postinst() {
 	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 lxd-migrate support"
+	optfeature "full lxd-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog

diff --git a/app-containers/lxd/lxd-5.18.ebuild b/app-containers/lxd/lxd-5.18.ebuild
index a7b9cee3c03f..d4b3da597693 100644
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -184,7 +184,7 @@ pkg_postinst() {
 	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 lxd-migrate support"
+	optfeature "full lxd-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog

diff --git a/app-containers/lxd/lxd-5.19.ebuild b/app-containers/lxd/lxd-5.19.ebuild
index 50e2b165276b..681eaf740cbf 100644
--- a/app-containers/lxd/lxd-5.19.ebuild
+++ b/app-containers/lxd/lxd-5.19.ebuild
@@ -180,7 +180,7 @@ pkg_postinst() {
 	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 lxd-migrate support"
+	optfeature "full lxd-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-12-12 16:55 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-12-12 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b0e643e25e7cf704d47ebe7ef8ab1389e33511f8
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Dec 12 15:56:49 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 16:54:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e643e2

app-containers/lxd: add 5.20

Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34253
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/Manifest        |   2 +
 app-containers/lxd/lxd-5.20.ebuild | 188 +++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index dd8673ce2dd6..4a4a8cde8103 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -4,3 +4,5 @@ DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
 DIST lxd-5.19.tar.gz 22506800 BLAKE2B 94940a9e886d005495f8888d4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386 SHA512 11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
 DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1 SHA512 2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
+DIST lxd-5.20.tar.gz 22825821 BLAKE2B 616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465 SHA512 cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3
+DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103 SHA512 e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3

diff --git a/app-containers/lxd/lxd-5.20.ebuild b/app-containers/lxd/lxd-5.20.ebuild
new file mode 100644
index 000000000000..2693dbf72267
--- /dev/null
+++ b/app-containers/lxd/lxd-5.20.ebuild
@@ -0,0 +1,188 @@
+# 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://ubuntu.com/lxd https://github.com/canonical/lxd"
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+	app-arch/xz-utils
+	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+	dev-db/sqlite:3
+	>=dev-libs/dqlite-1.13.0:=
+	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/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
+	sys-apps/iproute2
+	sys-fs/fuse:3
+	>=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-canonical )"
+
+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=/usr/share/openpgp-keys/canonical.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-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 lxd group."
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-12-12 18:05 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-12-12 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9ae02659749fd779009a2d26be66afb0aae46602
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 18:05:14 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 18:05:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae02659

app-containers/lxd: update LICENSE

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

 app-containers/lxd/lxd-5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.20.ebuild b/app-containers/lxd/lxd-5.20.ebuild
index 2693dbf72267..b9350b4d6f5b 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
 	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
 )"
 
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
 SLOT="0/stable"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor nls"


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2023-12-12 19:50 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2023-12-12 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a151520795aa968794db41f60af6bf2821eef84f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 19:50:15 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 19:50:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1515207

app-containers/lxd: require >=go-1.20 per upstream for 5.20

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

 app-containers/lxd/lxd-5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.20.ebuild b/app-containers/lxd/lxd-5.20.ebuild
index b9350b4d6f5b..13dccccabf6c 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
 	virtual/acl"
-BDEPEND="dev-lang/go
+BDEPEND=">=dev-lang/go-1.20
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-canonical )"
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-02-25  9:36 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-02-25  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     62628c3c6543da2a58ce7126569b1403543badd7
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 09:34:37 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 09:34:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62628c3c

app-containers/lxd: bump the dqlite version req on unstable pkgs

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

 app-containers/lxd/lxd-5.0.3-r2.ebuild | 2 +-
 app-containers/lxd/lxd-5.19-r1.ebuild  | 2 +-
 app-containers/lxd/lxd-5.20-r1.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3-r2.ebuild b/app-containers/lxd/lxd-5.0.3-r2.ebuild
index 36023d313b1e..7e0beb10eb7b 100644
--- a/app-containers/lxd/lxd-5.0.3-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=[lz4]
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]

diff --git a/app-containers/lxd/lxd-5.19-r1.ebuild b/app-containers/lxd/lxd-5.19-r1.ebuild
index 5ffa910f85e6..43ca84883aa1 100644
--- a/app-containers/lxd/lxd-5.19-r1.ebuild
+++ b/app-containers/lxd/lxd-5.19-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=[lz4]
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]

diff --git a/app-containers/lxd/lxd-5.20-r1.ebuild b/app-containers/lxd/lxd-5.20-r1.ebuild
index 830c03e24fb5..d7165784ee4d 100644
--- a/app-containers/lxd/lxd-5.20-r1.ebuild
+++ b/app-containers/lxd/lxd-5.20-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=[lz4]
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-02-25  9:36 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-02-25  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     2f1d0ea846bd5c47e46fedacce82cfcf5c5240b5
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 09:32:22 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 09:32:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1d0ea8

app-containers/lxd: revbump lts 5.0.3 due to dqlite<->raft update

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

 app-containers/lxd/{lxd-5.0.3-r1.ebuild => lxd-5.0.3-r2.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3-r1.ebuild b/app-containers/lxd/lxd-5.0.3-r2.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.0.3-r1.ebuild
rename to app-containers/lxd/lxd-5.0.3-r2.ebuild
index 0cb951baf4e3..36023d313b1e 100644
--- a/app-containers/lxd/lxd-5.0.3-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.13.0:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-02-25  9:36 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-02-25  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4786fda0544b736e852914bc34c1aa21fc6e3403
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 09:31:21 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 09:31:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4786fda0

app-containers/lxd: drop 5.0.3

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

 app-containers/lxd/lxd-5.0.3.ebuild | 214 ------------------------------------
 1 file changed, 214 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3.ebuild b/app-containers/lxd/lxd-5.0.3.ebuild
deleted file mode 100644
index ff98d497f293..000000000000
--- a/app-containers/lxd/lxd-5.0.3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2024 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://ubuntu.com/lxd https://github.com/canonical/lxd"
-SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
-	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
-)"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/lts"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
-	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/nftables[json]
-			(
-				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-canonical )"
-
-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=/usr/share/openpgp-keys/canonical.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=(
-	"${FILESDIR}"/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch
-)
-
-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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full lxd-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 lxd group."
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-	ver_test ${REPLACING_VERSIONS} -lt 5.0.1 &&
-	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
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-	has_version "sys-apps/openrc"; then
-		elog ""
-		elog "The new init.d script will attempt to mount "
-		elog "  /sys/fs/cgroup/systemd"
-		elog "by default, which is needed to run systemd containers with openrc host."
-		elog "See the /etc/init.d/lxd file for requirements."
-		elog ""
-	fi
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-02-25  9:36 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-02-25  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     8b8825bdc837424e00e4f32701f180aa881cb97c
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 09:30:58 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 09:30:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8825bd

app-containers/lxd: revbump to update dqlite<->raft deps on unstable

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

 app-containers/lxd/{lxd-5.19.ebuild => lxd-5.19-r1.ebuild} | 5 ++---
 app-containers/lxd/{lxd-5.20.ebuild => lxd-5.20-r1.ebuild} | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-containers/lxd/lxd-5.19.ebuild b/app-containers/lxd/lxd-5.19-r1.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-5.19.ebuild
rename to app-containers/lxd/lxd-5.19-r1.ebuild
index 2693dbf72267..5ffa910f85e6 100644
--- a/app-containers/lxd/lxd-5.19.ebuild
+++ b/app-containers/lxd/lxd-5.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.13.0:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap

diff --git a/app-containers/lxd/lxd-5.20.ebuild b/app-containers/lxd/lxd-5.20-r1.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-5.20.ebuild
rename to app-containers/lxd/lxd-5.20-r1.ebuild
index 13dccccabf6c..830c03e24fb5 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.13.0:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-02-27  7:28 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-02-27  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     2eb87936f7045bfd287ac4d3364a8757779fa997
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 07:25:13 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 07:28:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb87936

app-containers/lxd: revbump stable 5.0.2 to match dqlite changes

 - accidentally pushed new dqlite straight-to-stable, stable lxd
   needs to follow its changes.

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

 app-containers/lxd/{lxd-5.0.2-r3.ebuild => lxd-5.0.2-r4.ebuild} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild b/app-containers/lxd/lxd-5.0.2-r4.ebuild
similarity index 98%
rename from app-containers/lxd/lxd-5.0.2-r3.ebuild
rename to app-containers/lxd/lxd-5.0.2-r4.ebuild
index 16d15f1b9488..f74e0a523ad9 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,9 +19,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-02-29  7:29 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-02-29  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5c99f075b5b63218fb477def9138949ea269a5cf
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 07:22:41 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 07:29:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c99f075

app-containers/lxd: stabilize 5.0.3-r2 for amd64

Closes: https://bugs.gentoo.org/925685
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/lxd-5.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.0.3-r2.ebuild b/app-containers/lxd/lxd-5.0.3-r2.ebuild
index 7e0beb10eb7b..2a37a0ddeac2 100644
--- a/app-containers/lxd/lxd-5.0.3-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/lts"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-04-22  6:28 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-04-22  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     01321ad937dffa3af288b4272c0e997ea96b23a7
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Apr 20 19:08:51 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 06:26:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01321ad9

app-containers/lxd: add 5.21.1

Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36335
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/Manifest          |   2 +
 app-containers/lxd/lxd-5.21.1.ebuild | 187 +++++++++++++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 4a6f6672e70e..224db03baf4c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -8,3 +8,5 @@ DIST lxd-5.19.tar.gz 22506800 BLAKE2B 94940a9e886d005495f8888d4491e5a8f8beee60c4
 DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1 SHA512 2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
 DIST lxd-5.20.tar.gz 22825821 BLAKE2B 616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465 SHA512 cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3
 DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103 SHA512 e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3
+DIST lxd-5.21.1.tar.gz 23753867 BLAKE2B 102f3c83faa956f6a5f052912417f595a7374c13ff1da21e43b76e267908323f3db05aed8b83fb99a0b70ee03af9b1df0551a2c535db146d5ea6f415f7671e7a SHA512 809099d16ffd12b785a03ad3ed527fa6f0c7503a41b7c93d41fd3418d18f8c68c79e5a689c8df2ed4157d434742bfb5cc267a5afb9734091b224be644a3a6958
+DIST lxd-5.21.1.tar.gz.asc 833 BLAKE2B 1c43b7750e505ef66d4f9fcf3723abf28a7b4e2785866604b88f6dfa80f7e3d0ed33734bc49606ecff16659de9dabfbeb08ba71c36eafc8d05a28397e3e73a89 SHA512 8ec81d1df6d3b9aec58cbde08306a865f9c27e86be04da11a2b5566c78865b51f91edb6fa26e8b5d25202bf33657bd0f867ec986e4e8b39f379b25e03cd6a5d3

diff --git a/app-containers/lxd/lxd-5.21.1.ebuild b/app-containers/lxd/lxd-5.21.1.ebuild
new file mode 100644
index 000000000000..d7165784ee4d
--- /dev/null
+++ b/app-containers/lxd/lxd-5.21.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 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://ubuntu.com/lxd https://github.com/canonical/lxd"
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+	app-arch/xz-utils
+	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+	dev-db/sqlite:3
+	>=dev-libs/dqlite-1.16.4:=[lz4]
+	dev-libs/lzo
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp]
+	sys-libs/libcap
+	virtual/udev"
+RDEPEND="${DEPEND}
+	|| (
+			net-firewall/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
+	sys-apps/iproute2
+	sys-fs/fuse:3
+	>=sys-fs/lxcfs-5.0.0
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND=">=dev-lang/go-1.20
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-canonical )"
+
+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=/usr/share/openpgp-keys/canonical.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-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 lxd group."
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-05-13 18:27 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-05-13 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4d9f99471e8359ba6ad2d372f5558e99290d04a9
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon May 13 17:37:35 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:26:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d9f9947

app-containers/lxd: Fix lxd-5.21.1 requiring go >= 1.22.0

Closes: https://bugs.gentoo.org/931863
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36664
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/lxd-5.21.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.21.1.ebuild b/app-containers/lxd/lxd-5.21.1.ebuild
index d7165784ee4d..b501e2db6a66 100644
--- a/app-containers/lxd/lxd-5.21.1.ebuild
+++ b/app-containers/lxd/lxd-5.21.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
 	virtual/acl"
-BDEPEND=">=dev-lang/go-1.20
+BDEPEND=">=dev-lang/go-1.22
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-canonical )"
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-06-01  8:37 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-06-01  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     e34060946f75e8837542658393aa520772747a91
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 08:28:36 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 08:36:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3406094

app-containers/lxd: update 5.21.1's subslot to lts

 - as it's the LTS release.

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

 app-containers/lxd/{lxd-5.21.1.ebuild => lxd-5.21.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.21.1.ebuild b/app-containers/lxd/lxd-5.21.1-r1.ebuild
similarity index 99%
rename from app-containers/lxd/lxd-5.21.1.ebuild
rename to app-containers/lxd/lxd-5.21.1-r1.ebuild
index b501e2db6a66..2ab951d0103f 100644
--- a/app-containers/lxd/lxd-5.21.1.ebuild
+++ b/app-containers/lxd/lxd-5.21.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
 )"
 
 LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
-SLOT="0/stable"
+SLOT="0/lts"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-06-01  8:37 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-06-01  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     19a7a9d589e3b0ac46026a34b264bc9c9568ee1e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 08:29:06 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 08:36:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a7a9d5

app-containers/lxd: drop 5.20-r1

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

 app-containers/lxd/Manifest           |   2 -
 app-containers/lxd/lxd-5.20-r1.ebuild | 187 ----------------------------------
 2 files changed, 189 deletions(-)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index e528a0b2e764..cf0681bc67da 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,6 +1,4 @@
 DIST lxd-5.0.3.tar.gz 16628656 BLAKE2B d24b4b2e40635b109b69196995a434fac26e1ffb023bfd2181588ff7543a9022fcd82a0a4ac84d40a7a3f0dceda0167a55e64c40b91c3719dbbeac6e102dd211 SHA512 87f5d9fbe2cef5970c0a95f61dc615f26e4168202d39f53c7323787a246fa1d6a378c7b957d90f6afd02e048fb3080a06f7202d02652973fb33421f18680d9bf
 DIST lxd-5.0.3.tar.gz.asc 833 BLAKE2B c6ef26dc8ba4033dbc98367609826389640bfd31da25113f9285dc67b2a69da4fe06a3cacbb83fe5b1b984b5eed8ff3a373d5f88693c2999c10b25a7cfd4cd8d SHA512 424e969de30e4fcfabf65062f387d15bd1cc99ed2c984944c529df92d520b3d5de306a8d444850b3916889d318a88e521d275c62353b25853471efb713d58d18
-DIST lxd-5.20.tar.gz 22825821 BLAKE2B 616e6659c75e87027883dc6643c8c42cce75f69e7781b93371ca8d00078a7c5086679d70dfd5497ec6be9f917f07d81ef826fc0bdd09317d7b98e435f053c465 SHA512 cf593f967d9d595577ab9b05bad99d04b9c30031461fdd4769f4746e651b3aa8e94fca53548da1aec22ff312a91ff46710ab88043a633fbd78ffafe130fed3e3
-DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103 SHA512 e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3
 DIST lxd-5.21.1.tar.gz 23753867 BLAKE2B 102f3c83faa956f6a5f052912417f595a7374c13ff1da21e43b76e267908323f3db05aed8b83fb99a0b70ee03af9b1df0551a2c535db146d5ea6f415f7671e7a SHA512 809099d16ffd12b785a03ad3ed527fa6f0c7503a41b7c93d41fd3418d18f8c68c79e5a689c8df2ed4157d434742bfb5cc267a5afb9734091b224be644a3a6958
 DIST lxd-5.21.1.tar.gz.asc 833 BLAKE2B 1c43b7750e505ef66d4f9fcf3723abf28a7b4e2785866604b88f6dfa80f7e3d0ed33734bc49606ecff16659de9dabfbeb08ba71c36eafc8d05a28397e3e73a89 SHA512 8ec81d1df6d3b9aec58cbde08306a865f9c27e86be04da11a2b5566c78865b51f91edb6fa26e8b5d25202bf33657bd0f867ec986e4e8b39f379b25e03cd6a5d3

diff --git a/app-containers/lxd/lxd-5.20-r1.ebuild b/app-containers/lxd/lxd-5.20-r1.ebuild
deleted file mode 100644
index d7165784ee4d..000000000000
--- a/app-containers/lxd/lxd-5.20-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2024 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://ubuntu.com/lxd https://github.com/canonical/lxd"
-SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
-	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
-)"
-
-LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.16.4:=[lz4]
-	dev-libs/lzo
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	|| (
-			net-firewall/nftables[json]
-			(
-				net-firewall/ebtables
-				net-firewall/iptables
-			)
-	)
-	sys-apps/iproute2
-	sys-fs/fuse:3
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.20
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-canonical )"
-
-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=/usr/share/openpgp-keys/canonical.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full lxd-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 lxd group."
-}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-07-08  7:17 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-07-08  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     0d3377da63bbaa3b836322636b981d43ebbfb728
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 06:34:17 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 07:17:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3377da

app-containers/lxd: stabilize 5.21.1-r1 for amd64

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

 app-containers/lxd/lxd-5.21.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-5.21.1-r1.ebuild b/app-containers/lxd/lxd-5.21.1-r1.ebuild
index 2ab951d0103f..36ce81664eaa 100644
--- a/app-containers/lxd/lxd-5.21.1-r1.ebuild
+++ b/app-containers/lxd/lxd-5.21.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
 
 LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
 SLOT="0/lts"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 
 DEPEND="acct-group/lxd


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-07-11 16:36 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-07-11 16:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6b89360cdd3818d6ef83a9b070e25cb94327d9c1
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Wed Jul 10 13:49:19 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 16:36:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b89360c

app-containers/lxd: add 6.1

Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37483
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/Manifest       |   2 +
 app-containers/lxd/lxd-6.1.ebuild | 187 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index cf0681bc67da..1153055019e8 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,3 +2,5 @@ DIST lxd-5.0.3.tar.gz 16628656 BLAKE2B d24b4b2e40635b109b69196995a434fac26e1ffb0
 DIST lxd-5.0.3.tar.gz.asc 833 BLAKE2B c6ef26dc8ba4033dbc98367609826389640bfd31da25113f9285dc67b2a69da4fe06a3cacbb83fe5b1b984b5eed8ff3a373d5f88693c2999c10b25a7cfd4cd8d SHA512 424e969de30e4fcfabf65062f387d15bd1cc99ed2c984944c529df92d520b3d5de306a8d444850b3916889d318a88e521d275c62353b25853471efb713d58d18
 DIST lxd-5.21.1.tar.gz 23753867 BLAKE2B 102f3c83faa956f6a5f052912417f595a7374c13ff1da21e43b76e267908323f3db05aed8b83fb99a0b70ee03af9b1df0551a2c535db146d5ea6f415f7671e7a SHA512 809099d16ffd12b785a03ad3ed527fa6f0c7503a41b7c93d41fd3418d18f8c68c79e5a689c8df2ed4157d434742bfb5cc267a5afb9734091b224be644a3a6958
 DIST lxd-5.21.1.tar.gz.asc 833 BLAKE2B 1c43b7750e505ef66d4f9fcf3723abf28a7b4e2785866604b88f6dfa80f7e3d0ed33734bc49606ecff16659de9dabfbeb08ba71c36eafc8d05a28397e3e73a89 SHA512 8ec81d1df6d3b9aec58cbde08306a865f9c27e86be04da11a2b5566c78865b51f91edb6fa26e8b5d25202bf33657bd0f867ec986e4e8b39f379b25e03cd6a5d3
+DIST lxd-6.1.tar.gz 24960232 BLAKE2B 857d4896f1622166a79ea0324bc4c9c6276b83383f242f0d58e7d1295a5cfedfb9984166dbf92ca579a058482d3a5dc7d4f640832d8d8ad6a45a7a4c248b8a0a SHA512 e3e5fcb721767b3e317a9251b84537e2d055116d2bba23627e95d040e01bd14ef0a730bf0c83e441488c2afeb152e4288ec1ba80ba85391fde33766dadccc6d1
+DIST lxd-6.1.tar.gz.asc 833 BLAKE2B 4cbfcf04f82b2c817793405291566dd2525daba1e9c4d3656b0d694f351a7e5489cb3e6fc0001a58fea6892c5d08fb24ca369733287422b95c82b9252824c29b SHA512 ac6a9e643909fc8262ff7f3af4ef8bf847a8dbc6e74470a0c038231174dcef5d70ea9dcf490547d8b48836f87c86201377bc20b36d4d142b8e88b5467a6c6837

diff --git a/app-containers/lxd/lxd-6.1.ebuild b/app-containers/lxd/lxd-6.1.ebuild
new file mode 100644
index 000000000000..b45fd2e61a51
--- /dev/null
+++ b/app-containers/lxd/lxd-6.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 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://ubuntu.com/lxd https://github.com/canonical/lxd"
+SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
+	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
+)"
+
+LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
+SLOT="0/lts"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="apparmor nls"
+
+DEPEND="acct-group/lxd
+	app-arch/xz-utils
+	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+	dev-db/sqlite:3
+	>=dev-libs/dqlite-1.16.4:=[lz4]
+	dev-libs/lzo
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp]
+	sys-libs/libcap
+	virtual/udev"
+RDEPEND="${DEPEND}
+	|| (
+			net-firewall/nftables[json]
+			(
+				net-firewall/ebtables
+				net-firewall/iptables
+			)
+	)
+	sys-apps/iproute2
+	sys-fs/fuse:3
+	>=sys-fs/lxcfs-5.0.0
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND=">=dev-lang/go-1.22.4
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-canonical )"
+
+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=/usr/share/openpgp-keys/canonical.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+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-r1.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 "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-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 lxd group."
+}


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-07-11 16:40 Joonas Niilola
  0 siblings, 0 replies; 48+ messages in thread
From: Joonas Niilola @ 2024-07-11 16:40 UTC (permalink / raw
  To: gentoo-commits

commit:     8281cc21f66353112ac97c8bb8ccb4096db9cbe0
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 16:39:47 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 16:40:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8281cc21

app-containers/lxd: update subslot to "stable"

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

 app-containers/lxd/lxd-6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/lxd/lxd-6.1.ebuild b/app-containers/lxd/lxd-6.1.ebuild
index b45fd2e61a51..bd080aee1b6a 100644
--- a/app-containers/lxd/lxd-6.1.ebuild
+++ b/app-containers/lxd/lxd-6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
 )"
 
 LICENSE="Apache-2.0 AGPL-3+ BSD LGPL-3 MIT"
-SLOT="0/lts"
+SLOT="0/stable"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="apparmor nls"
 


^ permalink raw reply related	[flat|nested] 48+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/
@ 2024-10-10 16:33 James Le Cuirot
  0 siblings, 0 replies; 48+ messages in thread
From: James Le Cuirot @ 2024-10-10 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     6d2452471494701eea0a85c3fb1ea7d978da5a7b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 21:10:03 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:29:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d245247

app-containers/lxd: Update edk2 OVMF path adjustment

These files now live in /usr/share/edk2/OvmfX64. No revbump as there is a
compatibility symlink.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-containers/lxd/lxd-5.0.3-r2.ebuild  | 2 +-
 app-containers/lxd/lxd-5.21.1-r1.ebuild | 2 +-
 app-containers/lxd/lxd-6.1.ebuild       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-containers/lxd/lxd-5.0.3-r2.ebuild b/app-containers/lxd/lxd-5.0.3-r2.ebuild
index 2a37a0ddeac2..e6b8cc7f1855 100644
--- a/app-containers/lxd/lxd-5.0.3-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -103,7 +103,7 @@ src_prepare() {
 
 	# Fix hardcoded ovmf file path, see bug 763180
 	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
 		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
 		doc/environment.md \
 		lxd/apparmor/instance.go \

diff --git a/app-containers/lxd/lxd-5.21.1-r1.ebuild b/app-containers/lxd/lxd-5.21.1-r1.ebuild
index 36ce81664eaa..12cdb9a81965 100644
--- a/app-containers/lxd/lxd-5.21.1-r1.ebuild
+++ b/app-containers/lxd/lxd-5.21.1-r1.ebuild
@@ -97,7 +97,7 @@ src_prepare() {
 
 	# Fix hardcoded ovmf file path, see bug 763180
 	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
 		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
 		doc/environment.md \
 		lxd/apparmor/instance.go \

diff --git a/app-containers/lxd/lxd-6.1.ebuild b/app-containers/lxd/lxd-6.1.ebuild
index bd080aee1b6a..422d2004d236 100644
--- a/app-containers/lxd/lxd-6.1.ebuild
+++ b/app-containers/lxd/lxd-6.1.ebuild
@@ -97,7 +97,7 @@ src_prepare() {
 
 	# Fix hardcoded ovmf file path, see bug 763180
 	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
 		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
 		doc/environment.md \
 		lxd/apparmor/instance.go \


^ permalink raw reply related	[flat|nested] 48+ messages in thread

end of thread, other threads:[~2024-10-10 16:33 UTC | newest]

Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-12 16:55 [gentoo-commits] repo/gentoo:master commit in: app-containers/lxd/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-10-10 16:33 James Le Cuirot
2024-07-11 16:40 Joonas Niilola
2024-07-11 16:36 Joonas Niilola
2024-07-08  7:17 Joonas Niilola
2024-06-01  8:37 Joonas Niilola
2024-06-01  8:37 Joonas Niilola
2024-05-13 18:27 Joonas Niilola
2024-04-22  6:28 Joonas Niilola
2024-02-29  7:29 Joonas Niilola
2024-02-27  7:28 Joonas Niilola
2024-02-25  9:36 Joonas Niilola
2024-02-25  9:36 Joonas Niilola
2024-02-25  9:36 Joonas Niilola
2024-02-25  9:36 Joonas Niilola
2023-12-12 19:50 Joonas Niilola
2023-12-12 18:05 Joonas Niilola
2023-10-19 16:06 Joonas Niilola
2023-10-19 16:06 Joonas Niilola
2023-10-16 13:22 Joonas Niilola
2023-09-22  8:42 Joonas Niilola
2023-09-10 13:23 Joonas Niilola
2023-07-05  6:12 Joonas Niilola
2023-06-15 12:14 Joonas Niilola
2023-03-25  6:32 Joonas Niilola
2023-03-09  6:50 Joonas Niilola
2023-02-22  7:14 Joonas Niilola
2023-02-22  6:25 Joonas Niilola
2023-01-22 17:21 Joonas Niilola
2023-01-22  7:24 Joonas Niilola
2023-01-22  7:24 Joonas Niilola
2023-01-10 14:03 Joonas Niilola
2023-01-10 13:25 Joonas Niilola
2022-11-19  7:37 Joonas Niilola
2022-11-14  7:44 Joonas Niilola
2022-11-12  6:23 Joonas Niilola
2022-10-12 16:40 Joonas Niilola
2022-09-24 13:57 Joonas Niilola
2022-09-19  6:06 Joonas Niilola
2022-08-19  8:45 Joonas Niilola
2022-08-17  6:18 Joonas Niilola
2022-07-18  7:01 Joonas Niilola
2022-06-14 14:35 Joonas Niilola
2022-06-11  9:17 Joonas Niilola
2022-05-22  8:13 Jakov Smolić
2022-03-21  9:31 Joonas Niilola
2022-03-20  6:22 Joonas Niilola
2022-01-07 13:39 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox