From 9e3ca09dd47e369e0370034030a6181ef4a245b0 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 24 Dec 2012 00:03:32 +0400 Subject: [PATCH] conf.d/live.mk: firefox/chromium kiosk support As implemented in livecd-webkiosk-0.2. --- conf.d/live.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index 2e25a741..8e357348 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -45,20 +45,25 @@ distro/live-rescue: distro/live-icewm use/efi @$(call add,LIVE_LISTS,openssh \ $(call tags,(base || extra) && (archive || rescue || network))) -distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru +# 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 @$(call add,LIVE_LISTS,$(call tags,desktop && (live || network))) - @$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox) + @$(call add,LIVE_PACKAGES,alsa-utils udev-alsa) @$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*') - @#$(call set,KFLAVOURS,led-ws) + +distro/live-webkiosk-mini: distro/.live-webkiosk + @$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox) # NB: flash/java plugins are predictable security holes distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest @$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash) @$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun) - @$(call add,LIVE_PACKAGES,alsa-utils udev-alsa) distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @: +distro/live-webkiosk-chromium: distro/.live-webkiosk + @$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium) + distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary @$(call add,LIVE_PACKAGES,FlightGear fgo input-utils) @$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)