live-webkiosk-mini, tde: use led-ws kernel flavour

The rationale for the former is that the image gets slightly more compact (although the current sisyphus build is way larger than the t6/branch build of the optimization time, need to look into that...); and for the latter it's to provide yet another installer with a different enough kernel so that there's one more chance in a weird situation.

live-webkiosk-mini, tde: use led-ws kernel flavour
63b515c9 · Michael Shigorin · d445f5e3 · 63b515c9 · 63b515c9
Commit 63b515c9 authored Oct 27, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

desktop.mk conf.d/desktop.mk +3 -1

live.mk conf.d/live.mk +1 -0

No files found.
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -11,8 +11,10 @@ distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))

+distro/tde: distro/.desktop-mini +tde
+	@$(call set,KFLAVOURS,led-ws)
+
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
-distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:


--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -40,6 +40,7 @@ distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
+	@$(call set,KFLAVOURS,led-ws)

 # NB: flash/java plugins are predictable security holes
 distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest