Skip to content

M
mkimage-profiles
Commit 63d945f0 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

education.mk: switch to use/browser/chromium

use/browser/chromium itself switches on architectures where chromium is not available, to an available browser.
parent f10ff87d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
conf.d/education.mk
View file @ 63d945f0
...@@ -12,7 +12,8 @@ mixin/education: \ ...@@ -12,7 +12,8 @@ mixin/education: \
use/x11/lightdm/gtk +pulse \ use/x11/lightdm/gtk +pulse \
+nm use/x11/gtk/nm \ +nm use/x11/gtk/nm \
use/xdg-user-dirs/deep \ use/xdg-user-dirs/deep \
use/office/LibreOffice/full use/office/LibreOffice/full \
use/browser/chromium
@$(call set,BRANDING,alt-education) @$(call set,BRANDING,alt-education)
@$(call add,THE_BRANDING,indexhtml) @$(call add,THE_BRANDING,indexhtml)
@$(call add,THE_BRANDING,menu xfce-settings system-settings) @$(call add,THE_BRANDING,menu xfce-settings system-settings)
...@@ -39,12 +40,6 @@ mixin/education-live: \ ...@@ -39,12 +40,6 @@ 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 x86_64 aarch64,$(ARCH)))
@$(call add,LIVE_PACKAGES,chromium)
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)
...@@ -147,12 +142,6 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ...@@ -147,12 +142,6 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(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