From 35160dead4d2132adfe60c22478f246883b0e31e Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 19 Sep 2022 17:11:35 +0200 Subject: [PATCH] disable kde/plasma for riscv64 --- usr/lib/archboot/container.sh | 2 +- usr/lib/archboot/update-installer.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index 62731bbb8..8e686b803 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -200,7 +200,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} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES} ${_PLASMA_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}" [[ "${_CLEANUP_CACHE}" == "1" ]] && _GRAPHICAL_PACKAGES="" [[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb if [[ -e "${1}/$(basename "${_PACMAN_CONF}")" ]]; then diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh index 6a1a35ff6..744d78c96 100644 --- a/usr/lib/archboot/update-installer.sh +++ b/usr/lib/archboot/update-installer.sh @@ -27,9 +27,9 @@ _graphic_options() { if ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then echo -e " \033[1m-gnome\033[0m Launch Gnome desktop with VNC sharing enabled." echo -e " \033[1m-gnome-wayland\033[0m Launch Gnome desktop with Wayland backend." + echo -e " \033[1m-plasma\033[0m Launch KDE Plasma desktop with VNC sharing enabled." + echo -e " \033[1m-plasma-wayland\033[0m Launch KDE Plasma desktop with Wayland backend." fi - echo -e " \033[1m-plasma\033[0m Launch KDE Plasma desktop with VNC sharing enabled." - echo -e " \033[1m-plasma-wayland\033[0m Launch KDE Plasma desktop with Wayland backend." } usage () {