live.mk, p7.mk: prefer ESR if it's firefox

Both starterkits and live webkiosk images carrying Firefox are switched to ESR packages by this commit; note that those images with other browsers aren't affected.

live.mk, p7.mk: prefer ESR if it's firefox
d2de19e1 · Michael Shigorin · 5af8b76d · d2de19e1 · d2de19e1
Commit d2de19e1 authored Sep 08, 2015 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

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

p7.mk conf.d/p7.mk +1 -1

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -56,7 +56,9 @@ distro/.live-webkiosk: distro/.live-kiosk \
 distro/.live-webkiosk-gtk: distro/.live-webkiosk
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')

-distro/live-webkiosk-mini: distro/.live-webkiosk-gtk use/fonts/otf/mozilla
+# kiosk users rather prefer stability to latest bling
+distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
+	use/browser/firefox/esr use/fonts/otf/mozilla
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)

 # NB: flash/java plugins are predictable security holes

--- a/conf.d/p7.mk
+++ b/conf.d/p7.mk
 # p7 base kits

-mixin/p7:
+mixin/p7: use/browser/firefox/esr
 	@$(call set,BRANDING,altlinux-starterkit)

 ifeq (distro,$(IMAGE_CLASS))