Skip to content

M
mkimage-profiles
Commit 9eca1ea1 authored by Andrey Cherepanov's avatar Andrey Cherepanov Committed by Anton Midyukov
Browse files
Options

education: use firefox-esr instead of chromium for i586

parent 3b491150
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
conf.d/education.mk
View file @ 9eca1ea1
...@@ -39,9 +39,12 @@ mixin/education-live: \ ...@@ -39,9 +39,12 @@ mixin/education-live: \
use/live/repo use/live/x11 use/live/rw \ use/live/repo use/live/x11 use/live/rw \
use/cleanup/live-no-cleanupdb use/cleanup/live-no-cleanupdb
@$(call add,LIVE_PACKAGES,livecd-timezone) @$(call add,LIVE_PACKAGES,livecd-timezone)
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
@$(call add,LIVE_PACKAGES,chromium) @$(call add,LIVE_PACKAGES,chromium)
endif endif
ifeq (,$(filter-out i586,$(ARCH)))
@$(call add,LIVE_PACKAGES,firefox-esr)
endif
@$(call add,LIVE_PACKAGES,mc-full) @$(call add,LIVE_PACKAGES,mc-full)
@$(call add,LIVE_PACKAGES,remmina remmina-plugins) @$(call add,LIVE_PACKAGES,remmina remmina-plugins)
@$(call add,LIVE_PACKAGES,mousepad) @$(call add,LIVE_PACKAGES,mousepad)
...@@ -141,10 +144,15 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ...@@ -141,10 +144,15 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call add,THE_KMODULES,lsadrv bbswitch) @$(call add,THE_KMODULES,lsadrv bbswitch)
@$(call add,THE_KMODULES,staging) @$(call add,THE_KMODULES,staging)
@$(call add,MAIN_KMODULES,bbswitch) @$(call add,MAIN_KMODULES,bbswitch)
@$(call add,THE_PACKAGES,chromium)
@$(call add,THE_PACKAGES,mc-full) @$(call add,THE_PACKAGES,mc-full)
@$(call add,THE_PACKAGES,remmina remmina-plugins) @$(call add,THE_PACKAGES,remmina remmina-plugins)
endif endif
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
@$(call add,THE_PACKAGES,chromium)
endif
ifeq (,$(filter-out i586,$(ARCH)))
@$(call add,THE_PACKAGES,firefox-esr)
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_PACKAGES,syslinux) @$(call add,THE_PACKAGES,syslinux)
@$(call add,MAIN_PACKAGES,owamp-server) @$(call add,MAIN_PACKAGES,owamp-server)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment