altcloud/mkimage-profiles
2
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

vmguest: make arch-aware

Browse Source 
+vmguest should work everywhere it can at all either;
it's most advanced on x86_64 in terms of hypervisors
available; still aarch64 has kvm too.
This commit is contained in:
Michael Shigorin 2018-07-20 15:51:01 +03:00
parent 9e59e5a111
commit 98601e13f7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
features.in/vmguest/config.mk
View File

@ -1,11 +1,22 @@
# x86: various VM guest modules/tools
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vmguest: use/vmguest/complete; @:
# various VM guest modules/tools
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
use/vmguest:
@$(call add_feature)
# NB: only reasonable for X11-bearing images
# see also use/install2/kvm
use/vmguest/kvm: use/vmguest
@$(call add,THE_PACKAGES,qemu-guest-agent)
ifeq (,$(filter-out aarch64,$(ARCH)))
+vmguest: use/vmguest/kvm; @:
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vmguest: use/vmguest/complete; @:
use/vmguest/base: use/vmguest/vbox use/vmguest/vmware use/vmguest/kvm; @:
use/vmguest/complete: use/vmguest/base \
use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:
@ -17,11 +28,6 @@ use/vmguest/vbox/x11: use/vmguest/vbox
@$(call add,THE_KMODULES,drm)
@$(call add,THE_PACKAGES,virtualbox-guest-additions)
# NB: only reasonable for X11-bearing images
# see also use/install2/kvm
use/vmguest/kvm: use/vmguest
@$(call add,THE_PACKAGES,qemu-guest-agent)
use/vmguest/kvm/x11: use/vmguest/kvm
@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl)
@ -36,6 +42,8 @@ use/vmguest/vmware/x11: use/vmguest/vmware
else
# kvm-unsupported guest arch
+vmguest: ;@:
endif
endif