vmguest, install2: add vmware modules

led-ws kernel flavour has gained kernel-modules-vmware recently, let's add this to the appropriate targets. It's used in regular-jeos already but THE_ part was missing.

vmguest, install2: add vmware modules
600febca · Michael Shigorin · c74242f3 · 600febca · 600febca · 600febca
Commit 600febca authored May 11, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

regular.mk conf.d/regular.mk +1 -1

config.mk features.in/install2/config.mk +1 -0

config.mk features.in/vmguest/config.mk +8 -2

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -47,7 +47,7 @@ distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
 # - no +power or even use/power/acpi/button on intent
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
 distro/regular-jeos: distro/.base +sysvinit \
-	use/install2/packages use/install2/vmguest \
+	use/install2/packages use/install2/vmguest use/vmguest/base \
 	use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
 	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
 	use/cleanup/x11-alterator use/net use/kernel/net use/stage2/net-eth

--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -43,6 +43,7 @@ use/install2/vbox:

 # see also use/vmguest/vmware
 use/install2/vmware:
+	@$(call add,STAGE1_KMODULES,vmware)
 	@$(call add,STAGE1_KMODULES,scsi)	# mptspi in led-ws
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware)


--- a/features.in/vmguest/config.mk
+++ b/features.in/vmguest/config.mk
-+vmguest: use/vmguest/vbox use/vmguest/kvm use/vmguest/vmware; @:
+vmguest: use/vmguest/complete; @:

 use/vmguest:
 	@$(call add_feature)

-use/vmguest/vbox: use/vmguest
+use/vmguest/base: use/vmguest/vbox/base use/vmguest/vmware; @:
+use/vmguest/complete: use/vmguest/base use/vmguest/vbox use/vmguest/kvm; @:
+
+use/vmguest/vbox/base: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition vboxguest drm)
+
+use/vmguest/vbox: use/vmguest/vbox/base
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)

 # NB: only reasonable for X11-bearing images
@@ -14,4 +19,5 @@ use/vmguest/kvm: use/vmguest

 # see also use/install2/vmware
 use/vmguest/vmware:
+	@$(call add,THE_KMODULES,vmware)
 	@$(call add,THE_KMODULES,scsi)	# mptspi.ko