live.mk: tweak webkiosks regarding hybrid/efi

-mini image should be flash-friendly to be more useful,
and -flash bugtraq kitchen sink could use/efi as well.
This commit is contained in:
Michael Shigorin 2014-09-19 15:15:14 +04:00
parent a3ddce7a81
commit 4a6a88826c

View File

@ -54,12 +54,14 @@ distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
@$(call add,LIVE_LISTS,$(call tags,live desktop)) @$(call add,LIVE_LISTS,$(call tags,live desktop))
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*') @$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
distro/live-webkiosk-mini: distro/.live-webkiosk use/fonts/otf/mozilla distro/live-webkiosk-mini: distro/.live-webkiosk \
use/fonts/otf/mozilla use/isohybrid
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox) @$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes # NB: flash/java plugins are predictable security holes
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \ distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
use/browser/plugin/flash use/browser/plugin/java +vmguest; @: use/browser/plugin/flash use/browser/plugin/java use/efi/signed \
+vmguest; @:
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @: distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @: