From f044f58775f2cf45e10c22119581e5e136d35123 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 25 Dec 2013 01:09:50 +0200 Subject: [PATCH] install2, sound, vmguest: support led-ws modules led@ has different kernel-modules-* package set, some of those "standard" names are provided but vbox* is not the case. As our macros and helpers will grok this just fine, let's add both variants so what's present gets in. --- features.in/install2/config.mk | 2 +- features.in/sound/config.mk | 2 +- features.in/vmguest/config.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk index 67b0d731..4b30d162 100644 --- a/features.in/install2/config.mk +++ b/features.in/install2/config.mk @@ -34,7 +34,7 @@ use/install2/kvm: # virtualbox guest support for installer use/install2/vbox: - @$(call add,STAGE1_KMODULES,virtualbox-addition) + @$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest) # filesystems handling use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @: diff --git a/features.in/sound/config.mk b/features.in/sound/config.mk index 40a88707..a3edddbe 100644 --- a/features.in/sound/config.mk +++ b/features.in/sound/config.mk @@ -3,7 +3,7 @@ # "bare" ALSA (which is good enough for many of us) with persistent levels use/sound: @$(call add_feature) - @$(call add,THE_KMODULES,alsa) + @$(call add,THE_KMODULES,alsa sound) @$(call add,THE_PACKAGES,amixer alsa-utils aplay udev-alsa) # PulseAudio (useful for per-app levels, dynamic devices and networked sound) diff --git a/features.in/vmguest/config.mk b/features.in/vmguest/config.mk index 67457573..1aa1112f 100644 --- a/features.in/vmguest/config.mk +++ b/features.in/vmguest/config.mk @@ -4,7 +4,7 @@ use/vmguest: @$(call add_feature) use/vmguest/virtualbox: use/vmguest - @$(call add,THE_KMODULES,virtualbox-addition drm) + @$(call add,THE_KMODULES,virtualbox-addition vboxguest drm) @$(call add,THE_PACKAGES,virtualbox-guest-additions) # NB: only reasonable for X11-bearing images