From 3dc8d1c61a9fec498e989f1153947bdb7cbb80c8 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Tue, 24 Dec 2019 17:59:56 +0300 Subject: [PATCH] slinux: Fix adding browser list This list must be added for all SL variants. Thanks jqt4@ for spotting. This fixes commit 91715712cea6485e5395712d34441ae5a89fdbb3. --- features.in/slinux/config.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 4acd37f2..4bc1545d 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -62,6 +62,11 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ @$(call add,THE_LISTS,slinux/xfce-base) @$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_KMODULES,staging) +ifeq (,$(filter-out armh aarch64 e2k%,$(ARCH))) + @$(call add,THE_LISTS,slinux/browser-firefox) +else + @$(call add,THE_LISTS,slinux/browser-chromium) +endif use/slinux/base: use/isohybrid use/luks \ +plymouth use/memtest +vmguest \ @@ -81,11 +86,6 @@ use/slinux/base: use/isohybrid use/luks \ @$(call add,STAGE2_PACKAGES,chrony) @$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call add,EFI_BOOTARGS,lang=ru_RU) -ifeq (,$(filter-out armh aarch64 e2k%,$(ARCH))) - @$(call add,THE_LISTS,slinux/browser-firefox) -else - @$(call add,THE_LISTS,slinux/browser-chromium) -endif use/slinux/full: use/slinux/base @$(call add,MAIN_LISTS,slinux/not-install-full)