root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add firefox for riscv64

Browse source
This commit is contained in:
Tobias Powalowski 2022-09-20 07:35:16 +02:00
parent 9b51646a1c
commit 1bb9e9523c
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/lib/archboot/common.sh
View file

@ -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() {

3
usr/lib/archboot/container.sh
View file

@ -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