slinux: merge lists slinux/browser-{firefox,chromium} into slinux/browser

Since, starting with the version of mkimage-profiles 1.4.21, enumeration of architectures in lists is supported, it can be simplified.

slinux: merge lists slinux/browser-{firefox,chromium} into slinux/browser
cdd71457 · Anton Midyukov · 3ff7fef5 · cdd71457 · cdd71457 · 3ff7fef5
Commit cdd71457 authored Jun 25, 2022 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

config.mk features.in/slinux/config.mk +2 -6

browser pkg.in/lists/slinux/browser +3 -1

browser-chromium pkg.in/lists/slinux/browser-chromium +0 -1

No files found.
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -60,7 +60,7 @@ endif
 	@$(call add,THE_PACKAGES,installer-feature-sudo-enable-by-default-stage3)

 ifeq (,$(filter-out riscv64,$(ARCH)))
-use/slinux/vm-base:: use/oem/vnc use/browser/epiphany
+use/slinux/vm-base:: use/oem/vnc
 	@$(call add,THE_PACKAGES,xfce-reduced-resource)
 	@$(call set,KFLAVOURS,un-def)
 endif
@@ -78,11 +78,7 @@ 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 mipsel e2k% i586,$(ARCH)))
-	@$(call add,THE_LISTS,slinux/browser-firefox)
-else
-	@$(call add,THE_LISTS,slinux/browser-chromium)
-endif
+	@$(call add,THE_LISTS,slinux/browser)
 ifeq (,$(filter-out armh mipsel e2k%,$(ARCH)))
 	@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
 else

--- a/pkg.in/lists/slinux/browser-firefox
+++ b/pkg.in/lists/slinux/browser-firefox
-firefox-esr
+chromium@x86_64,aarch64
+firefox-esr@E2K,i586,armh,mipsel
+epiphany@riscv64

 # h.264 for firefox-esr 52.9.0-alt1.E2K.8 (ffmpeg 3)
 libavcodec57@E2K

--- a/pkg.in/lists/slinux/browser-chromium
+++ b/pkg.in/lists/slinux/browser-chromium
-chromium@!riscv64