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

Merge pull request #9 from sailfish-on-dontbeevil/glob-expansion-failure 

Fix glob expansion which resulted in some boot failures
This commit is contained in:
Dylan Van Assche 2020-05-05 15:59:45 +02:00 committed by GitHub
parent 51baade149 1bd68e90e6
commit 9cf68b7b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flash-it.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
VERSION="0.3.1"
VERSION="0.3.2"
BRANCH=master
CUSTOM=""
UBOOT_JOB=u-boot
@ -237,11 +237,15 @@ sync
echo -e "\e[1mCopying kernel to boot partition...\e[0m"
mkdir "$MOUNT_BOOT"
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
sudo cp "${CUSTOM}/boot.scr" "$MOUNT_BOOT/boot.scr"
sudo sh -c "cp '${CUSTOM}/boot.scr' '$MOUNT_BOOT/boot.scr'"
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
sync