jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove last traces of armv7h support

This commit is contained in:
Dan Johansen 2019-07-07 19:04:52 +02:00
parent 23441d7d0e
commit c56355ab66
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -49,6 +49,7 @@ clear && bash manjaro-arm-installer
* Minimal (no xorg, no apps) * Minimal (no xorg, no apps)
* KDE/Plasma (full plasma desktop with apps) * KDE/Plasma (full plasma desktop with apps)
* LXQT (full LXQT desktop with some qt apps) * LXQT (full LXQT desktop with some qt apps)
* Mate (full mate desktop with apps)
* CuboCore (base plasma desktop with CoreApps) * CuboCore (base plasma desktop with CoreApps)
## Other notes: ## Other notes:

37
manjaro-arm-installer
View File

@ -115,12 +115,6 @@ getarmprofiles () {
} }
create_install() { create_install() {
if [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "xu4" ]]; then
ARCH='armv7h'
else
ARCH='aarch64'
fi
msg "Creating install for $DEVICE..." msg "Creating install for $DEVICE..."
msg "Used device is ${SDCARD}${SDDEV}x" msg "Used device is ${SDCARD}${SDDEV}x"
@ -142,10 +136,10 @@ create_install() {
if [[ "$DEVICE" = "on2" ]]; then if [[ "$DEVICE" = "on2" ]]; then
if [[ "$EDITION" = "kde" ]] || [[ "$EDITION" = "cubocore" ]]; then if [[ "$EDITION" = "kde" ]] || [[ "$EDITION" = "cubocore" ]]; then
$NSPAWN $TMPDIR/root pacman -R sddm sddm-kcm --noconfirm $NSPAWN $TMPDIR/root pacman -R sddm sddm-kcm --noconfirm
$NSPAWN $TMPDIR/root pacman -S sddm-n2 sddm-kcm --noconfirm $NSPAWN $TMPDIR/root pacman -S sddm-compat sddm-kcm --noconfirm
elif [[ "$EDITION" = "lxqt" ]]; then elif [[ "$EDITION" = "lxqt" ]]; then
$NSPAWN $TMPDIR/root pacman -R sddm sddm-qt-manjaro-theme --noconfirm $NSPAWN $TMPDIR/root pacman -R sddm sddm-qt-manjaro-theme --noconfirm
$NSPAWN $TMPDIR/root pacman -S sddm-n2 sddm-qt-manjaro-theme --noconfirm $NSPAWN $TMPDIR/root pacman -S sddm-compat sddm-qt-manjaro-theme --noconfirm
fi fi
fi fi
@ -153,6 +147,9 @@ create_install() {
# Enable services # Enable services
$NSPAWN $TMPDIR/root systemctl enable getty.target haveged.service 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable getty.target haveged.service 1> /dev/null 2>&1
$NSPAWN $TMPDIR/root systemctl enable $SRV_EDITION 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable $SRV_EDITION 1> /dev/null 2>&1
if [ -f $TMPDIR/root/usr/bin/xdg-user-dirs-update ]; then
$NSPAWN $TMPDIR/root systemctl --global enable xdg-user-dirs-update.service 1> /dev/null 2>&1
fi
info "Applying overlay for $EDITION..." info "Applying overlay for $EDITION..."
cp -ap $TMPDIR/arm-profiles/overlays/$EDITION/* $TMPDIR/root/ cp -ap $TMPDIR/arm-profiles/overlays/$EDITION/* $TMPDIR/root/
@ -199,12 +196,12 @@ create_install() {
fi fi
info "Doing device specific setups for $DEVICE..." info "Doing device specific setups for $DEVICE..."
if [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "rpi3" ]]; then if [[ "$DEVICE" = "rpi3" ]]; then
echo "dtparam=audio=on" | tee --append $TMPDIR/root/boot/config.txt 1> /dev/null 2>&1 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 echo "blacklist vchiq" | tee --append $TMPDIR/root/etc/modprobe.d/blacklist-vchiq.conf 1> /dev/null 2>&1
echo "blacklist snd_bcm2835" | tee --append $TMPDIR/root/etc/modprobe.d/blacklist-vchiq.conf 1> /dev/null 2>&1 echo "blacklist snd_bcm2835" | tee --append $TMPDIR/root/etc/modprobe.d/blacklist-vchiq.conf 1> /dev/null 2>&1
echo "LABEL=BOOT /boot vfat defaults 0 0" | tee --append $TMPDIR/root/etc/fstab 1> /dev/null 2>&1 echo "LABEL=BOOT /boot vfat defaults 0 0" | tee --append $TMPDIR/root/etc/fstab 1> /dev/null 2>&1
elif [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "oc2" ]]; then elif [[ "$DEVICE" = "oc2" ]]; then
$NSPAWN $TMPDIR/root systemctl enable amlogic.service 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable amlogic.service 1> /dev/null 2>&1
elif [[ "$DEVICE" = "on2" ]]; then elif [[ "$DEVICE" = "on2" ]]; then
$NSPAWN $TMPDIR/root systemctl disable dhcpcd.service 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl disable dhcpcd.service 1> /dev/null 2>&1
@ -216,11 +213,7 @@ create_install() {
fi fi
info "Cleaning install for unwanted files..." info "Cleaning install for unwanted files..."
if [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "xu4" ]]; then
rm $TMPDIR/root/usr/bin/qemu-arm-static
else
rm $TMPDIR/root/usr/bin/qemu-aarch64-static rm $TMPDIR/root/usr/bin/qemu-aarch64-static
fi
rm -rf $TMPDIR/root/var/cache/pacman/pkg/* rm -rf $TMPDIR/root/var/cache/pacman/pkg/*
rm -rf $TMPDIR/root/var/log/* rm -rf $TMPDIR/root/var/log/*
rm -rf $TMPDIR/root/usr/lib/systemd/system/systemd-firstboot.service rm -rf $TMPDIR/root/usr/lib/systemd/system/systemd-firstboot.service
@ -236,7 +229,7 @@ create_install() {
prepare_card () { prepare_card () {
msg "Getting $SDCARD ready for $DEVICE..." msg "Getting $SDCARD ready for $DEVICE..."
# For Raspberry Pi devices # For Raspberry Pi devices
if [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "rpi3" ]]; then if [[ "$DEVICE" = "rpi3" ]]; then
# umount SD card # umount SD card
umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1 umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1
umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1 umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1
@ -259,7 +252,7 @@ prepare_card () {
mount ${SDCARD}${SDDEV}2 $TMPDIR/root mount ${SDCARD}${SDDEV}2 $TMPDIR/root
# For Odroid devices # For Odroid devices
elif [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "oc2" ]] || [[ "$DEVICE" = "xu4" ]]; then elif [[ "$DEVICE" = "oc2" ]]; then
# umount SD card # umount SD card
umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1 umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1
umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1 umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1
@ -348,7 +341,7 @@ prepare_card () {
cleanup () { cleanup () {
msg "Writing bootloader and cleaning up after install..." msg "Writing bootloader and cleaning up after install..."
# For Raspberry Pi devices # For Raspberry Pi devices
if [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "rpi3" ]]; then if [[ "$DEVICE" = "rpi3" ]]; then
#move boot files #move boot files
mv $TMPDIR/root/boot/* $TMPDIR/boot mv $TMPDIR/root/boot/* $TMPDIR/boot
@ -359,7 +352,7 @@ cleanup () {
partprobe $SDCARD 1> /dev/null 2>&1 partprobe $SDCARD 1> /dev/null 2>&1
# For Odroid devices # For Odroid devices
elif [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "oc2" ]] || [[ "$DEVICE" = "xu4" ]]; then elif [[ "$DEVICE" = "oc2" ]]; then
#flash bootloader #flash bootloader
cd $TMPDIR/root/boot/ cd $TMPDIR/root/boot/
./sd_fusing.sh $SDCARD 1> /dev/null 2>&1 ./sd_fusing.sh $SDCARD 1> /dev/null 2>&1
@ -431,10 +424,10 @@ if [ ! -z "$DEVICE" ]; then
--menu "Choose an edition:" 20 75 10 \ --menu "Choose an edition:" 20 75 10 \
"minimal" "Minimal Edition (only CLI)" \ "minimal" "Minimal Edition (only CLI)" \
"kde" "Full KDE/Plasma Desktop (full featured)" \ "kde" "Full KDE/Plasma Desktop (full featured)" \
"mate" "Full MATE desktop and apps (lightweight)" \
"lxqt" "Full LXQT Desktop and apps (lightweight)" \ "lxqt" "Full LXQT Desktop and apps (lightweight)" \
"i3" "Mininal i3 WM with apps (very light)" \ "i3" "Mininal i3 WM with apps (very light)" \
"cubocore" "QT based Desktop (lightweight)" \ "cubocore" "QT based Desktop (lightweight)" \
"mate" "Full MATE desktop and apps (lightweight, unmaintained)" \
3>&1 1>&2 2>&3 3>&-) 3>&1 1>&2 2>&3 3>&-)
else else
@ -633,12 +626,6 @@ case $response in
esac esac
if [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "xu4" ]]; then
ARCH='armv7h'
else
ARCH='aarch64'
fi
# get the profiles # get the profiles
getarmprofiles getarmprofiles