altcloud/mkimage-profiles
2
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Michael Shigorin
2015-09-08 20:18:29 +03:00
parent 5af8b76db8
commit d2de19e1f3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/live.mk
View File

@ -56,7 +56,9 @@ distro/.live-webkiosk: distro/.live-kiosk \
distro/.live-webkiosk-gtk: distro/.live-webkiosk distro/.live-webkiosk-gtk: distro/.live-webkiosk
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*') @$(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) @$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes # NB: flash/java plugins are predictable security holes

2
conf.d/p7.mk
View File

@ -1,6 +1,6 @@
# p7 base kits # p7 base kits
mixin/p7: mixin/p7: use/browser/firefox/esr
@$(call set,BRANDING,altlinux-starterkit) @$(call set,BRANDING,altlinux-starterkit)
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))