summaryrefslogtreecommitdiff
path: root/app-containers/lxd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-01-07 22:48:01 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-01-07 22:48:01 +0000
commitc3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
treeb6d19e96ba3c397fb8278eeb9b68170db92630ba /app-containers/lxd
parent3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)
gentoo resync : 07.01.2022
Diffstat (limited to 'app-containers/lxd')
-rw-r--r--app-containers/lxd/Manifest2
-rw-r--r--app-containers/lxd/lxd-4.0.8-r2.ebuild (renamed from app-containers/lxd/lxd-4.0.8-r1.ebuild)14
2 files changed, 14 insertions, 2 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 974ed6d1d03c..78c934c1e575 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -7,5 +7,5 @@ AUX lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch 2184 BLAKE2B ee6b371694a59
AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
-EBUILD lxd-4.0.8-r1.ebuild 4542 BLAKE2B f9ff9870aaf7b3638cf7296a8b26edfec266c3280c4d4c8059a5e9c9266d1be36f03c3319f66d46c832b0bb8e6076065b0c427ff8f2ffcef25b91d3a4addfc1a SHA512 31c5f59028c495bb2308b9f71ca616267aca235f0f66d876be9bc30202018d4202d56b27d19c11524c7f99574f6c1651c9b4e4c773e8ad723bc76fd437fcc091
+EBUILD lxd-4.0.8-r2.ebuild 5010 BLAKE2B f26824c565e1c57305d9b0487b27a27fec08de895400b1f5a0aa18b504dc331d8a563ad1168f455a48bab9cdc39511e9363e821fc6dfb3d8d5fed65c6dd5bc10 SHA512 25c1f9408781386b7af95f63406137cf38b41280290e2effe2933b52e61fe87daab96f82fa7ee80b125fdf3ee2456c80572f5aab00a6b55d28810d56e4a0a779
MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c
diff --git a/app-containers/lxd/lxd-4.0.8-r1.ebuild b/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