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

add support for Pine64+ and update readme

This commit is contained in:
Dan Johansen 2019-08-23 08:41:06 +02:00
parent d6e037ed8a
commit 91f0ab3ea5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -46,10 +46,12 @@ clear && bash manjaro-arm-installer
* Khadas Vim 3 (new) * Khadas Vim 3 (new)
* Rock Pi 4 * Rock Pi 4
* Pine64-LTS / Sopine * Pine64-LTS / Sopine
* Pine64+
## Supported Editions / Desktops: ## Supported Editions / Desktops:
* Minimal (no xorg, no apps) * Minimal (no xorg, no apps)
* KDE/Plasma (full plasma desktop with apps) * KDE/Plasma (full plasma desktop with apps)
* XFCE (full XFCE 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) * Mate (full mate desktop with apps)
* CuboCore (base plasma desktop with CoreApps) * CuboCore (base plasma desktop with CoreApps)

9
manjaro-arm-installer
View File

@ -217,7 +217,7 @@ create_install() {
elif [[ "$DEVICE" = "vim3" ]]; then elif [[ "$DEVICE" = "vim3" ]]; then
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
$NSPAWN $TMPDIR/root systemctl enable bluetooth-khadas.service 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable bluetooth-khadas.service 1> /dev/null 2>&1
elif [[ "$DEVICE" = "pinebook" ]]; then elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine"]] || [[ "$DEVICE" = "pine64" ]]; then
$NSPAWN $TMPDIR/root systemctl enable pinebook-post-install.service 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable pinebook-post-install.service 1> /dev/null 2>&1
else else
echo "No device specific setting needed for $DEVICE" echo "No device specific setting needed for $DEVICE"
@ -335,7 +335,7 @@ prepare_card () {
# For pine devices # For pine devices
elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]] || [[ "$DEVICE" = "pine64" ]]; 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
@ -429,7 +429,7 @@ cleanup () {
partprobe $SDCARD 1> /dev/null 2>&1 partprobe $SDCARD 1> /dev/null 2>&1
# For pinebook device # For pinebook device
elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]] || [[ "$DEVICE" = "pine64" ]]; then
#flash bootloader #flash bootloader
dd if=$TMPDIR/root/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} bs=8k seek=1 1> /dev/null 2>&1 dd if=$TMPDIR/root/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} bs=8k seek=1 1> /dev/null 2>&1
@ -440,7 +440,7 @@ cleanup () {
# For rockpro64 device # For rockpro64 device
elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]]; then elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]] || [[ "$DEVICE" = "rockpi4" ]]; then
#flash bootloader #flash bootloader
dd if=$TMPDIR/root/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc 1> /dev/null 2>&1 dd if=$TMPDIR/root/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc 1> /dev/null 2>&1
dd if=$TMPDIR/root/boot/uboot.img of=${SDCARD} seek=16384 conv=notrunc 1> /dev/null 2>&1 dd if=$TMPDIR/root/boot/uboot.img of=${SDCARD} seek=16384 conv=notrunc 1> /dev/null 2>&1
@ -463,6 +463,7 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \
"rock64" "ROCK64" \ "rock64" "ROCK64" \
"rockpro64" "ROCKPro64" \ "rockpro64" "ROCKPro64" \
"sopine" "SOPINE / PINE A64-LTS" \ "sopine" "SOPINE / PINE A64-LTS" \
"pine64" "Pine64+" \
"oc2" "Odroid C2" \ "oc2" "Odroid C2" \
"on2" "Odroid N2" \ "on2" "Odroid N2" \
"vim3" "Khadas Vim 3" \ "vim3" "Khadas Vim 3" \