From 24b97382622ce1f3b0d59849051960dc1030d25b Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Thu, 22 Oct 2020 12:12:30 +0100 Subject: [PATCH 1/5] Add pinetabdev device, which uses the normal pinetab rootfs, but different uboot script --- flash-it.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/flash-it.sh b/flash-it.sh index 8e4c384..005b3c4 100755 --- a/flash-it.sh +++ b/flash-it.sh @@ -5,14 +5,24 @@ BRANCH=master CUSTOM="" UBOOT_JOB=u-boot UBOOT_DIR=u-boot-bootloader + ROOTFS_PINEPHONE_1_0_JOB=pinephone-1.0-rootfs ROOTFS_PINEPHONE_1_1_JOB=pinephone-1.1-rootfs ROOTFS_PINETAB_JOB=pinetab-rootfs +ROOTFS_PINETABDEV_JOB=pinetab-rootfs ROOTFS_DEVKIT_JOB=devkit-rootfs ROOTFS_PINEPHONE_1_0_DIR=pinephone-1.0 ROOTFS_PINEPHONE_1_1_DIR=pinephone-1.1 ROOTFS_PINETAB_DIR=pinetab +ROOTFS_PINETABDEV_DIR=pinetab ROOTFS_DEVKIT_DIR=devkit + +UBOOT_PINEPHONE_1_0_DIR=pinephone-1.0 +UBOOT_PINEPHONE_1_1_DIR=pinephone-1.1 +UBOOT_PINETAB_DIR=pinetab +UBOOT_PINETABDEV_DIR=pinetabdev +UBOOT_DEVKIT_DIR=devkit + MOUNT_DATA=./data MOUNT_BOOT=./boot @@ -138,12 +148,13 @@ echo "" # Image selection echo -e "\e[1mWhich image do you want to flash?\e[0m" -select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) device" "PineTab device" "Dont Be Evil devkit"; do +select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) device" "PineTab device" "PineTab Dev device" "Dont Be Evil devkit"; do case $OPTION in - "PinePhone 1.0 (Development) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_0_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_0_DIR; break;; - "PinePhone 1.1 (Brave Heart) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; break;; - "PineTab device" ) ROOTFS_JOB=$ROOTFS_PINETAB_JOB; ROOTFS_DIR=$ROOTFS_PINETAB_DIR; break;; - "Dont Be Evil devkit" ) ROOTFS_JOB=$ROOTFS_DEVKIT_JOB; ROOTFS_DIR=$ROOTFS_DEVKIT_DIR; break;; + "PinePhone 1.0 (Development) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_0_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_0_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_0_DIR; break;; + "PinePhone 1.1 (Brave Heart) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_1_DIR; break;; + "PineTab device" ) ROOTFS_JOB=$ROOTFS_PINETAB_JOB; ROOTFS_DIR=$ROOTFS_PINETAB_DIR; UBOOT_DEV_DIR=$UBOOT_PINETAB_DIR; break;; + "PineTab Dev device" ) ROOTFS_JOB=$ROOTFS_PINETABDEV_JOB; ROOTFS_DIR=$ROOTFS_PINETABDEV_DIR; UBOOT_DEV_DIR=$UBOOT_PINETABDEV_DIR; break;; + "Dont Be Evil devkit" ) ROOTFS_JOB=$ROOTFS_DEVKIT_JOB; ROOTFS_DIR=$ROOTFS_DEVKIT_DIR; UBOOT_DEV_DIR=$UBOOT_DEVKIT_DIR; break;; esac done @@ -244,7 +255,7 @@ echo `ls $MOUNT_BOOT` if [ "$CUSTOM" != "" ]; then sudo sh -c "cp '${CUSTOM}/boot.scr' '$MOUNT_BOOT/boot.scr'" else - sudo sh -c "cp './u-boot-bootloader/$ROOTFS_DIR/boot.scr' '$MOUNT_BOOT/boot.scr'" + sudo sh -c "cp './u-boot-bootloader/$UBOOT_DEV_DIR/boot.scr' '$MOUNT_BOOT/boot.scr'" fi sync From 97eb6078f7d481102f2ec1637247f6b18115613b Mon Sep 17 00:00:00 2001 From: Simon Schmeisser Date: Mon, 16 Nov 2020 21:36:05 +0100 Subject: [PATCH 2/5] hack that loads compiled crust from pine64 --- flash-it.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/flash-it.sh b/flash-it.sh index 005b3c4..0647e9f 100755 --- a/flash-it.sh +++ b/flash-it.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="0.3.2" +VERSION="0.3.3" BRANCH=master CUSTOM="" UBOOT_JOB=u-boot @@ -167,6 +167,13 @@ $WGET "${UBOOT_JOB}.zip" "${UBOOT_DOWNLOAD}" || { exit 2 } +UBOOT_DOWNLOAD2="https://gitlab.com/pine64-org/crust-meta/-/jobs/artifacts/master/raw/u-boot-sunxi-with-spl-pinephone.bin?job=build" +$WGET "u-boot-sunxi-with-spl-pinephone.bin" "${UBOOT_DOWNLOAD2}" || { + echo >&2 "UBoot image download failed. Aborting." + exit 2 +} + + ROOTFS_DOWNLOAD="https://gitlab.com/sailfishos-porters-ci/dont_be_evil-ci/-/jobs/artifacts/$BRANCH/download?job=$ROOTFS_JOB" $WGET "${ROOTFS_JOB}.zip" "${ROOTFS_DOWNLOAD}" || { echo >&2 "Root filesystem image download failed. Aborting." @@ -226,7 +233,7 @@ if [ "$CUSTOM" != "" ]; then sudo dd if="${CUSTOM}/u-boot-sunxi-with-spl.bin" of="$DEVICE_NODE" bs=8k seek=1 else unzip "${UBOOT_JOB}.zip" -sudo dd if="./u-boot-bootloader/u-boot/u-boot-sunxi-with-spl.bin" of="$DEVICE_NODE" bs=8k seek=1 +sudo dd if="./u-boot-sunxi-with-spl-pinephone.bin" of="$DEVICE_NODE" bs=8k seek=1 fi sync From 79a63f5816223be45117f648c8e1c5ab334473f2 Mon Sep 17 00:00:00 2001 From: Natanael Arndt Date: Sat, 6 Mar 2021 10:58:22 +0100 Subject: [PATCH 3/5] Fix #16. Introduce check_sudo_dependency. --- flash-it.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/flash-it.sh b/flash-it.sh index 0647e9f..e0ccb63 100755 --- a/flash-it.sh +++ b/flash-it.sh @@ -88,6 +88,13 @@ function check_dependency { } } +# Add sbin to the PATH to check for commands available to sudo +function check_sudo_dependency { + dependency=$1 + local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin + check_dependency $dependency +} + # Determine if wget supports the --show-progress option (introduced in # 1.16). If so, make use of that instead of spewing out redirects and # loads of info into the terminal. @@ -105,14 +112,14 @@ function wget_cmd { } # Check dependencies -check_dependency "parted" check_dependency "sudo" check_dependency "wget" check_dependency "tar" check_dependency "unzip" check_dependency "lsblk" -check_dependency "mkfs.ext4" -check_dependency "losetup" +check_sudo_dependency "parted" +check_sudo_dependency "mkfs.ext4" +check_sudo_dependency "losetup" # If use custom dir check it if [ "$CUSTOM" != "" ]; then From 5059792eb91a903b688e493fc0cd89286070c0a3 Mon Sep 17 00:00:00 2001 From: Natanael Arndt Date: Mon, 8 Mar 2021 12:08:55 +0100 Subject: [PATCH 4/5] Fix #18. Add PinePhone 1.2 to image selection. --- flash-it.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flash-it.sh b/flash-it.sh index e0ccb63..005644d 100755 --- a/flash-it.sh +++ b/flash-it.sh @@ -158,7 +158,7 @@ echo -e "\e[1mWhich image do you want to flash?\e[0m" select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) device" "PineTab device" "PineTab Dev device" "Dont Be Evil devkit"; do case $OPTION in "PinePhone 1.0 (Development) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_0_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_0_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_0_DIR; break;; - "PinePhone 1.1 (Brave Heart) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_1_DIR; break;; + "PinePhone 1.1 (Brave Heart) or 1.2 (Community Editions) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_1_DIR; break;; "PineTab device" ) ROOTFS_JOB=$ROOTFS_PINETAB_JOB; ROOTFS_DIR=$ROOTFS_PINETAB_DIR; UBOOT_DEV_DIR=$UBOOT_PINETAB_DIR; break;; "PineTab Dev device" ) ROOTFS_JOB=$ROOTFS_PINETABDEV_JOB; ROOTFS_DIR=$ROOTFS_PINETABDEV_DIR; UBOOT_DEV_DIR=$UBOOT_PINETABDEV_DIR; break;; "Dont Be Evil devkit" ) ROOTFS_JOB=$ROOTFS_DEVKIT_JOB; ROOTFS_DIR=$ROOTFS_DEVKIT_DIR; UBOOT_DEV_DIR=$UBOOT_DEVKIT_DIR; break;; From 2df425c82926f46c6bc686e046fa42c4ab16aef3 Mon Sep 17 00:00:00 2001 From: Natanael Arndt Date: Mon, 8 Mar 2021 19:18:14 +0100 Subject: [PATCH 5/5] Fix options --- flash-it.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flash-it.sh b/flash-it.sh index 005644d..cf95837 100755 --- a/flash-it.sh +++ b/flash-it.sh @@ -155,7 +155,7 @@ echo "" # Image selection echo -e "\e[1mWhich image do you want to flash?\e[0m" -select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) device" "PineTab device" "PineTab Dev device" "Dont Be Evil devkit"; do +select OPTION in "PinePhone 1.0 (Development) device" "PinePhone 1.1 (Brave Heart) or 1.2 (Community Editions) device" "PineTab device" "PineTab Dev device" "Dont Be Evil devkit"; do case $OPTION in "PinePhone 1.0 (Development) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_0_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_0_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_0_DIR; break;; "PinePhone 1.1 (Brave Heart) or 1.2 (Community Editions) device" ) ROOTFS_JOB=$ROOTFS_PINEPHONE_1_1_JOB; ROOTFS_DIR=$ROOTFS_PINEPHONE_1_1_DIR; UBOOT_DEV_DIR=$UBOOT_PINEPHONE_1_1_DIR; break;;