diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 709f06d..44fa094 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -1,7 +1,7 @@ #! /bin/bash # ***************************** -# Version 1.2.13 +# Version 1.2.14 # ***************************** # Set globals @@ -207,6 +207,18 @@ create_install() { info "Doing device specific setups for $DEVICE..." + if [[ "$EDITION" = "kde-plasma" ]]; then + # Lima devices are not capable of running Plasma with hardware acceleration yet + if [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "sopine" ]] || [[ "$DEVICE" = "pine64" ]]; then + sed -i s/'#QT_QUICK_BACKEND=software'/'QT_QUICK_BACKEND=software'/ $TMPDIR/root/etc/environment 1> /dev/null 2>&1 + fi + fi + if [[ "$DEVICE" = "rockpro64" ]] || [[ "$DEVICE" = "rockpi4" ]] || [[ "$DEVICE" = "pbpro" ]]; then + # XFCE don't work right with panfrost yet + if [[ "$EDITION" = "xfce" ]]; then + $NSPAWN $TMPDIR/root pacman -S xf86-video-fbturbo-git --noconfirm 1> /dev/null 2>&1 + fi + fi if [[ "$DEVICE" = "rpi3" ]]; then echo "dtparam=audio=on" | tee --append $TMPDIR/root/boot/config.txt 1> /dev/null 2>&1 echo "blacklist vchiq" | tee --append $TMPDIR/root/etc/modprobe.d/blacklist-vchiq.conf 1> /dev/null 2>&1 @@ -230,7 +242,7 @@ create_install() { sed -i s/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)"/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck bootsplash-manjaro)"/g $TMPDIR/root/etc/mkinitcpio.conf $NSPAWN $TMPDIR/root mkinitcpio -P 1> /dev/null 2>&1 elif [[ "$DEVICE" = "pinephone" ]] || [[ "$DEVICE" = "pinetab" ]]; then - $NSPAWN $TMPDIR/root systemctl enable pinebook-post-install.service 1> /dev/null 2>&1 + $NSPAWN $TMPDIR/root systemctl enable pinephone-post-install.service 1> /dev/null 2>&1 sed -i s/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)"/"HOOKS=(base udev autodetect modconf block filesystems keyboard fsck bootsplash-manjaro)"/g $TMPDIR/root/etc/mkinitcpio.conf $NSPAWN $TMPDIR/root mkinitcpio -P 1> /dev/null 2>&1 if [[ "$EDITION" = "kde" ]] || [[ "$EDITION" = "cubocore" ]]; then