From 8cbb7146eabf56b1be7ab93bc800e2b5ea5e2a5c Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 2 Mar 2015 20:07:22 +0300 Subject: [PATCH] vmguest: fixup vbox targets use/vmguest/vbox/base used to pull in DRM modules which are required for vboxvideo but useless without xorg bits; and all of these aren't needed in jeos. Things might break, doublecheck please. --- features.in/vmguest/config.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/features.in/vmguest/config.mk b/features.in/vmguest/config.mk index f5db1fb6..4fb84034 100644 --- a/features.in/vmguest/config.mk +++ b/features.in/vmguest/config.mk @@ -3,13 +3,14 @@ use/vmguest: @$(call add_feature) -use/vmguest/base: use/vmguest/vbox/base use/vmguest/vmware; @: -use/vmguest/complete: use/vmguest/base use/vmguest/vbox use/vmguest/kvm; @: +use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @: +use/vmguest/complete: use/vmguest/base use/vmguest/vbox/x11 use/vmguest/kvm; @: -use/vmguest/vbox/base: use/vmguest - @$(call add,THE_KMODULES,virtualbox-addition vboxguest drm) +use/vmguest/vbox: use/vmguest + @$(call add,THE_KMODULES,virtualbox-addition vboxguest) -use/vmguest/vbox: use/vmguest/vbox/base +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