From 1bb9e9523cfb66a75867fd7b20992cf2538edcc8 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 20 Sep 2022 07:35:16 +0200
Subject: [PATCH] add firefox for riscv64

---
 usr/lib/archboot/common.sh    | 6 ++++--
 usr/lib/archboot/container.sh | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index d378dae7a..1a31e175a 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -10,8 +10,10 @@ _FIX_PACKAGES="libunwind libelf libevent python talloc gdbm fuse3 gcc-libs perl
 _XORG_PACKAGE="xorg"
 _VNC_PACKAGE="tigervnc"
 _WAYLAND_PACKAGE="egl-wayland"
-_STANDARD_PACKAGES="gparted nss-mdns chromium"
-_GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_PLASMA_PACKAGES}"
+_STANDARD_PACKAGES="gparted nss-mdns"
+_STANDARD_BROWSER="chromium"
+[[ "${_RUNNING_ARCH}" == "riscv64" ]] && _STANDARD_BROWSER="firefox"
+_GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_PLASMA_PACKAGES}"
 
 ### check for root
 _root_check() {
diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index 4f9b0ed41..def5d7de9 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -163,6 +163,7 @@ _install_base_packages() {
 }
 
 _install_archboot() {
+    [[ "${_RUNNING_ARCH}" == "riscv64" ]] && _GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES}"
     [[ "${_CLEANUP_CACHE}" == "1" ]] && _GRAPHICAL_PACKAGES=""
     [[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
     echo "Adding ${_GPG_KEY_ID} to trusted keys"
@@ -200,7 +201,7 @@ _other_install_base_packages() {
 
 _other_install_archboot() {
     # riscv64 need other packages
-    [[ "$(echo $(systemd-nspawn -q -D "${1}" uname -m) | sed -e 's#\r##g')" == "riscv64" ]] && _GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES}"
+    [[ "$(echo $(systemd-nspawn -q -D "${1}" uname -m) | sed -e 's#\r##g')" == "riscv64" ]] && _GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES}"
     [[ "${_CLEANUP_CACHE}" == "1" ]] && _GRAPHICAL_PACKAGES=""
     [[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
     if [[ -e "${1}/$(basename "${_PACMAN_CONF}")"  ]]; then