crt0mega
/
flash-it
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity

Fix glob expansion which resulted in some boot failures

This commit is contained in:
Dylan Van Assche 2020-05-01 14:41:14 +02:00
parent 51baade149
commit 1bd68e90e6
No known key found for this signature in database
GPG Key ID: EB0030A875E07AD0
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flash-it.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION="0.3.1" VERSION="0.3.2"
BRANCH=master BRANCH=master
CUSTOM="" CUSTOM=""
UBOOT_JOB=u-boot UBOOT_JOB=u-boot
@ -223,11 +223,11 @@ sync
echo -e "\e[1mFlashing rootFS...\e[0m" echo -e "\e[1mFlashing rootFS...\e[0m"
mkdir "$MOUNT_DATA" mkdir "$MOUNT_DATA"
if [ "$CUSTOM" != "" ]; then if [ "$CUSTOM" != "" ]; then
TEMP="${CUSTOM}/rootfs.tar.bz2" TEMP="${CUSTOM}/rootfs.tar.bz2"
else else
unzip "${ROOTFS_JOB}.zip" unzip "${ROOTFS_JOB}.zip"
TEMP=`ls $ROOTFS_DIR/*/*.tar.bz2` TEMP=`ls $ROOTFS_DIR/*/*.tar.bz2`
echo "$TEMP" echo "$TEMP"
fi fi
sudo mount $DATAPART "$MOUNT_DATA" # Mount data partition sudo mount $DATAPART "$MOUNT_DATA" # Mount data partition
sudo tar -xpf "$TEMP" -C "$MOUNT_DATA" sudo tar -xpf "$TEMP" -C "$MOUNT_DATA"
@ -237,11 +237,15 @@ sync
echo -e "\e[1mCopying kernel to boot partition...\e[0m" echo -e "\e[1mCopying kernel to boot partition...\e[0m"
mkdir "$MOUNT_BOOT" mkdir "$MOUNT_BOOT"
sudo mount $BOOTPART "$MOUNT_BOOT" # Mount boot partition sudo mount $BOOTPART "$MOUNT_BOOT" # Mount boot partition
sudo cp $MOUNT_DATA/boot/* $MOUNT_BOOT echo "Boot partition mount: $MOUNT_BOOT"
sudo sh -c "cp $MOUNT_DATA/boot/Image $MOUNT_BOOT"
sudo sh -c "cp $MOUNT_DATA/boot/*.dtb $MOUNT_BOOT"
sudo sh -c "cp $MOUNT_DATA/boot/*.dts $MOUNT_BOOT"
echo `ls $MOUNT_BOOT`
if [ "$CUSTOM" != "" ]; then if [ "$CUSTOM" != "" ]; then
sudo cp "${CUSTOM}/boot.scr" "$MOUNT_BOOT/boot.scr" sudo sh -c "cp '${CUSTOM}/boot.scr' '$MOUNT_BOOT/boot.scr'"
else else
sudo cp "./u-boot-bootloader/$ROOTFS_DIR/boot.scr" "$MOUNT_BOOT/boot.scr" sudo sh -c "cp './u-boot-bootloader/$ROOTFS_DIR/boot.scr' '$MOUNT_BOOT/boot.scr'"
fi fi
sync sync
@ -256,10 +260,10 @@ done
sudo losetup -D sudo losetup -D
if [ "$CUSTOM" == "" ]; then if [ "$CUSTOM" == "" ]; then
rm "${UBOOT_JOB}.zip" rm "${UBOOT_JOB}.zip"
rm -r "$UBOOT_DIR" rm -r "$UBOOT_DIR"
rm "${ROOTFS_JOB}.zip" rm "${ROOTFS_JOB}.zip"
rm -r "$ROOTFS_DIR" rm -r "$ROOTFS_DIR"
fi fi
sudo rm -rf "$MOUNT_DATA" sudo rm -rf "$MOUNT_DATA"
sudo rm -rf "$MOUNT_BOOT" sudo rm -rf "$MOUNT_BOOT"