len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-04-12 00:47:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hiby: r1_patcher: fix possible boot hang and flash failures

Browse source 
- Sort image parts for deterministic results.
- Ensure bootloader.r1 is correctly named and has +x permissions.

Change-Id: I391c935d75e5079010fc91d3614d9221d34e4c6b
This commit is contained in:
Roman Artiukhin 2026-01-19 18:49:31 +02:00
parent 7bc856046b
commit b25f59a98a
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tools/r1_patcher/r1_patcher.sh
View file

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
#Prerequisites:
#sudo apt update && sudo apt install -y p7zip-full squashfs-tools genisoimage coreutils
if [[ $# -ne 2 ]]; then if [[ $# -ne 2 ]]; then
echo 'usage: ./r1_patcher.sh r1.upt bootloader.r1' >&2 echo 'usage: ./r1_patcher.sh r1.upt bootloader.r1' >&2
exit 1 exit 1
@ -48,7 +51,8 @@ unsquashfs -f -d $workingdir_in/rootfs/extracted $workingdir_in/rootfs/rootfs.sq
################################################################################ ################################################################################
# copy 'bootloader' # copy 'bootloader'
cp $2 $workingdir_in/rootfs/extracted/usr/bin/ cp "$2" "$workingdir_in/rootfs/extracted/usr/bin/bootloader.r1"
chmod 0755 "$workingdir_in/rootfs/extracted/usr/bin/bootloader.r1"
# copy modified 'hibyplayer.sh' script # copy modified 'hibyplayer.sh' script
cp hiby_player.sh $workingdir_in/rootfs/extracted/usr/bin/ cp hiby_player.sh $workingdir_in/rootfs/extracted/usr/bin/
@ -58,10 +62,9 @@ chmod 0755 $workingdir_in/rootfs/extracted/usr/bin/hiby_player.sh
### rebuild ### rebuild
################################################################################ ################################################################################
mkdir "$workingdir_out/image_contents" mkdir -p "$workingdir_out/image_contents/ota_v0"
mkdir "$workingdir_out/image_contents/ota_v0"
mksquashfs $workingdir_in/rootfs/extracted $workingdir_out/rootfs.squashfs -comp lzo mksquashfs $workingdir_in/rootfs/extracted $workingdir_out/rootfs.squashfs -comp lzo -all-root
cd "$workingdir_out/image_contents/ota_v0" cd "$workingdir_out/image_contents/ota_v0"
@ -74,12 +77,11 @@ md5=$rootfs_md5
ota_md5_rootfs="ota_md5_rootfs.squashfs.$md5" ota_md5_rootfs="ota_md5_rootfs.squashfs.$md5"
parts=`find . -name 'rootfs.squashfs.*'` for part in $(ls rootfs.squashfs.[0-9]* | sort); do
for part in $parts; do md5next=($(md5sum $part))
md5next=($(md5sum $part)) echo $md5next >> $ota_md5_rootfs
echo $md5next >> $ota_md5_rootfs mv $part "$part.$md5"
mv $part "$part.$md5" md5=$md5next
md5=$md5next
done done
# xImage # xImage
@ -91,12 +93,11 @@ md5=$ximage_md5
ota_md5_xImage="ota_md5_xImage.$md5" ota_md5_xImage="ota_md5_xImage.$md5"
parts=`find . -name 'xImage.*'` for part in $(ls xImage.[0-9]* | sort); do
for part in $parts; do md5next=($(md5sum $part))
md5next=($(md5sum $part)) echo $md5next >> $ota_md5_xImage
echo $md5next >> $ota_md5_xImage mv $part "$part.$md5"
mv $part "$part.$md5" md5=$md5next
md5=$md5next
done done
# ota_update.in # ota_update.in