live, live.mk: use/browser now

Firefox was the very reasonable default for initial livecd implementation but now that at least initial browser chooser infrastructure is in place it's time to un-hardwire its use. It's _the_ default but switchable now so that images providing a comprehensive browser can avoid feature duplication.

live, live.mk: use/browser now
b9de03f7 · Michael Shigorin · d986baac · b9de03f7 · b9de03f7 · b9de03f7
Commit b9de03f7 authored May 23, 2014 by Michael Shigorin
Showing with 6 additions and 8 deletions

live.mk conf.d/live.mk +3 -4

config.mk features.in/live/config.mk +3 -2

desktop+live pkg.in/lists/tagged/desktop+live +0 -1

desktop+network pkg.in/lists/tagged/desktop+network +0 -1

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -51,16 +51,15 @@ distro/live-rescue: distro/live-icewm use/efi

 # 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
-	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
+	@$(call add,LIVE_LISTS,$(call tags,live desktop))
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')

 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)
+distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
+	use/browser/plugin/flash use/browser/plugin/java +vmguest; @:

 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:


--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -39,9 +39,10 @@ use/live/x11: use/live/base use/syslinux/localboot.cfg \
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,LIVE_PACKAGES,pciutils)

-# this target specifically pulls free xorg drivers in (and a few more bits)
+# this target specifically pulls free xorg drivers in (and a few more bits);
+# a browser is requested too, the recommended one can be overridden downstream
 use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
-	use/xdg-user-dirs/deep +vmguest; @:
+	use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:

 # preconfigure apt for both live and installed-from-live systems
 use/live/repo: use/live

--- a/pkg.in/lists/tagged/desktop+live
+++ b/pkg.in/lists/tagged/desktop+live
 xdm
 xinit
 xinitrc
-livecd-firefox
 livecd-setlocale
 installer-feature-runlevel5-stage3
 os-prober

--- a/pkg.in/lists/tagged/desktop+network
+++ b/pkg.in/lists/tagged/desktop+network
-firefox