refactor: format/install script minor tweaks

Signed-off-by: Christian Stewart <[email protected]>
skiffos · Sep 15, 2023 · 08a365d · 08a365d
1 parent 5188b02
commit 08a365d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/configs/bananapi/common/scripts/format_sd.sh b/configs/bananapi/common/scripts/format_sd.sh
@@ -26,7 +26,7 @@ if [ ! -b "$PI_SD" ]; then
 fi
 
 resources_path="${SKIFF_CURRENT_CONF_DIR}/resources"
-ubootimg="$BUILDROOT_DIR/images/u-boot-sunxi-with-spl.bin"
+ubootimg="${BUILDROOT_DIR}/images/u-boot-sunxi-with-spl.bin"
 
 if [ ! -f "$ubootimg" ]; then
   echo "can't find u-boot image at $ubootimg"
@@ -86,4 +86,7 @@ sudo $MKEXT4 -L "persist" ${PI_SD_SFX}2
 echo "Flashing u-boot..."
 sudo dd if=$ubootimg of=${PI_SD} conv=fsync bs=1024 seek=8
 
+sleep 1
+sudo partprobe ${PI_SD} || true
+
 echo "Done!"
diff --git a/configs/bananapi/common/scripts/install_sd.sh b/configs/bananapi/common/scripts/install_sd.sh
@@ -20,7 +20,7 @@ if [ -b ${PI_SD}p1 ]; then
     PI_SD_SFX=${PI_SD}p
 fi
 
-outp_path="${BUILDROOT_DIR}/output"
+outp_path="${BUILDROOT_DIR}"
 images_path="${outp_path}/images"
 uimg_path="${images_path}/zImage"
 squashfs_path="${images_path}/rootfs.squashfs"

diff --git a/configs/orangepi/common/scripts/format_sd.sh b/configs/orangepi/common/scripts/format_sd.sh
@@ -26,7 +26,7 @@ if [ ! -b "$PI_SD" ]; then
 fi
 
 resources_path="${SKIFF_CURRENT_CONF_DIR}/resources"
-ubootimg="$BUILDROOT_DIR/output/images/u-boot-sunxi-with-spl.bin"
+ubootimg="${BUILDROOT_DIR}/images/u-boot-sunxi-with-spl.bin"
 
 if [ ! -f "$ubootimg" ]; then
   echo "can't find u-boot image at $ubootimg"

diff --git a/configs/pi/common/scripts/format_sd.sh b/configs/pi/common/scripts/format_sd.sh
@@ -34,8 +34,7 @@ if [ -z "$SKIFF_NO_INTERACTIVE" ]; then
   fi
 fi
 
-set -x
-set -e
+set -xe
 
 echo "Zeroing out partition table..."
 sudo dd if=/dev/zero of=${PI_SD} conv=fsync bs=1024 count=4900
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,8 +34,7 @@ if [ -z "$SKIFF_NO_INTERACTIVE" ]; then @@
       fi
     fi
-    set -x
-    set -e
+    set -xe
     echo "Zeroing out partition table..."
     sudo dd if=/dev/zero of=${PI_SD} conv=fsync bs=1024 count=4900
@@ Expand Down @@