virtualbox feature renamed to vm, extended

Initial SPICE support has been added for kvm/libvirt installation and boot-up using qxl and spice by default as proposed by shaba@. VirtualBox part is shifted a level deeper correspondingly but otherwise stays the same.

virtualbox feature renamed to vm, extended
48587911 · Michael Shigorin · 03de0aab · 48587911 · 48587911 · 48587911
Commit 48587911 authored Apr 10, 2012 by Michael Shigorin
6 changed files
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,7 +6,7 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg

 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

-distro/.desktop-network: distro/.desktop-mini use/virtualbox/guest
+distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))

 distro/icewm: distro/.desktop-network use/lowmem +icewm; @:

--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -5,6 +5,9 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))

-### FR: curl-mini
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
+
+# see also use/vm/kvm/guest; qxl included in xorg pkglist
+use/install2/kvm:
+	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -10,8 +10,7 @@ use/live/base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))

 # optimized out: use/x11/xorg
-use/live/desktop: use/live/base use/x11/wacom use/virtualbox/guest \
-	use/live/sound +power
+use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)

--- a/features.in/virtualbox/config.mk
+++ b/features.in/virtualbox/config.mk
-use/virtualbox/guest:
-	@$(call add_feature)
-	@$(call add,THE_KMODULES,virtualbox-addition)
-	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
--- a/features.in/vm/config.mk
+++ b/features.in/vm/config.mk
+vmguest: use/vm/virtualbox/guest use/vm/kvm/guest; @:
+
+use/vm/virtualbox/guest:
+	@$(call add_feature)
+	@$(call add,THE_KMODULES,virtualbox-addition)
+	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
+
+# NB: only reasonable for X11-bearing images
+use/vm/kvm/guest:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,spice-vdagent)
+
+# see also use/install2/kvm
--- a/lib/distro.mk
+++ b/lib/distro.mk
@@ -31,7 +31,8 @@ distro/.base: distro/.init

 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
-distro/installer: distro/.base use/install2 use/syslinux/localboot.cfg
+distro/installer: distro/.base use/install2 use/install2/kvm \
+	use/syslinux/localboot.cfg
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)	# for KMS