use/browser,lists: firefox is now available for riscv64

Now that firefox is available in sisyphus_riscv64, let's use it as our default browser. Note that firefox-esr is not yet available, so now on riscv64 firefox is selected for use/browser/firefox-esr.

use/browser,lists: firefox is now available for riscv64
d55c0985 · Ivan A. Melnikov · a1d2dab8 · d55c0985 · d55c0985
Commit d55c0985 authored Dec 02, 2022 by Ivan A. Melnikov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 9 deletions

config.mk features.in/browser/config.mk +2 -8

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

No files found.
--- a/features.in/browser/config.mk
+++ b/features.in/browser/config.mk
@@ -32,21 +32,15 @@ ifneq (,$(filter-out i586 x86_64,$(ARCH)))
 use/browser/seamonkey: use/browser/firefox use/browser/firefox/esr; @:
 endif

-ifeq (,$(filter-out riscv64,$(ARCH)))
-use/browser/firefox: use/browser/midori
-else
 # support both firefox and firefox-esr
 use/browser/firefox: use/browser
 	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
-endif

 # the complete lack of dependencies is intentional
 use/browser/firefox/esr:
+ifneq (,$(filter-out riscv64,$(ARCH)))
 	@$(call set,FX_FLAVOUR,-esr)
+endif

-ifneq (,$(filter-out riscv64,$(ARCH)))
 use/browser/firefox/live: use/browser/firefox
 	@$(call add,THE_BROWSER,livecd-firefox)
-else
-use/browser/firefox/live: ; @:
-endif
--- a/pkg.in/lists/slinux/browser
+++ b/pkg.in/lists/slinux/browser
 chromium@x86_64,aarch64
 firefox-esr@E2K,i586,armh,mipsel
-epiphany@riscv64
+firefox@riscv64

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