diff --git a/conf.d/live.mk b/conf.d/live.mk index 33618fa1..d0ebc4b5 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -49,8 +49,7 @@ distro/live-rescue: distro/live-icewm use/efi $(call tags,(base || extra) && (archive || rescue || network))) # NB: this one doesn't include the browser, needs to be chosen downstream -distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru \ - use/sound/alsa +distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound @$(call add,LIVE_LISTS,$(call tags,desktop && (live || network))) @$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*') diff --git a/features.in/sound/config.mk b/features.in/sound/config.mk index fe4a7d55..40a88707 100644 --- a/features.in/sound/config.mk +++ b/features.in/sound/config.mk @@ -1,14 +1,10 @@ +pulse: use/sound/pulse; @: -# common ALSA based part +# "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_PACKAGES,amixer alsa-utils aplay) - -# "bare" ALSA (which is good enough for many of us) with persistent levels -use/sound/alsa: use/sound - @$(call add,THE_PACKAGES,udev-alsa) + @$(call add,THE_PACKAGES,amixer alsa-utils aplay udev-alsa) # PulseAudio (useful for per-app levels, dynamic devices and networked sound) use/sound/pulse: use/sound