| 1 |
commit: 862a2b98b7b8abf9062a0f562a2e7b9670e82752 |
| 2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 7 13:36:01 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 7 13:38:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862a2b98 |
| 7 |
|
| 8 |
app-containers/lxd: fix the sed for OVMF path, add notes about vm's |
| 9 |
|
| 10 |
- lxd supports virtual machines through qemu which wasn't advertised |
| 11 |
in the ebuild. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/830612 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
.../lxd/{lxd-4.0.8-r1.ebuild => lxd-4.0.8-r2.ebuild} | 14 +++++++++++++- |
| 17 |
1 file changed, 13 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/app-containers/lxd/lxd-4.0.8-r1.ebuild b/app-containers/lxd/lxd-4.0.8-r2.ebuild |
| 20 |
similarity index 89% |
| 21 |
rename from app-containers/lxd/lxd-4.0.8-r1.ebuild |
| 22 |
rename to app-containers/lxd/lxd-4.0.8-r2.ebuild |
| 23 |
index 11314dde35da..f33144850c9d 100644 |
| 24 |
--- a/app-containers/lxd/lxd-4.0.8-r1.ebuild |
| 25 |
+++ b/app-containers/lxd/lxd-4.0.8-r2.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2021 Gentoo Authors |
| 28 |
+# Copyright 1999-2022 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
@@ -47,6 +47,10 @@ CONFIG_CHECK=" |
| 33 |
~SECCOMP |
| 34 |
~USER_NS |
| 35 |
~UTS_NS |
| 36 |
+ |
| 37 |
+ ~KVM |
| 38 |
+ ~MACVTAP |
| 39 |
+ ~VHOST_VSOCK |
| 40 |
" |
| 41 |
|
| 42 |
ERROR_IPC_NS="CONFIG_IPC_NS is required." |
| 43 |
@@ -55,6 +59,10 @@ ERROR_PID_NS="CONFIG_PID_NS is required." |
| 44 |
ERROR_SECCOMP="CONFIG_SECCOMP is required." |
| 45 |
ERROR_UTS_NS="CONFIG_UTS_NS is required." |
| 46 |
|
| 47 |
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines." |
| 48 |
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines." |
| 49 |
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines." |
| 50 |
+ |
| 51 |
# Go magic. |
| 52 |
QA_PREBUILT="/usr/bin/fuidshift |
| 53 |
/usr/bin/lxc |
| 54 |
@@ -91,6 +99,7 @@ src_prepare() { |
| 55 |
-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ |
| 56 |
-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \ |
| 57 |
doc/environment.md \ |
| 58 |
+ lxd/apparmor/instance.go \ |
| 59 |
lxd/apparmor/instance_qemu.go \ |
| 60 |
lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." |
| 61 |
|
| 62 |
@@ -167,9 +176,12 @@ pkg_postinst() { |
| 63 |
elog |
| 64 |
elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," |
| 65 |
elog "including a Quick Start." |
| 66 |
+ elog "For virtual machine support, see:" |
| 67 |
+ elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines" |
| 68 |
elog |
| 69 |
elog "Please run 'lxc-checkconfig' to see all optional kernel features." |
| 70 |
elog |
| 71 |
+ optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] |
| 72 |
optfeature "btrfs storage backend" sys-fs/btrfs-progs |
| 73 |
optfeature "lvm2 storage backend" sys-fs/lvm2 |
| 74 |
optfeature "zfs storage backend" sys-fs/zfs |
Archives