Skip to content

Commit d509aef

Browse files
committed
fix: detect Raspberry Pi OS image offset
1 parent aa814cd commit d509aef

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.github/workflows/docker_build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,14 @@ jobs:
2929
run: |
3030
wget -q https://downloads.raspberrypi.org/raspios_lite_arm64_latest -O rpi-os.img.xz
3131
xz -d rpi-os.img.xz
32+
33+
SECTOR_SIZE=512
34+
START_SECTOR=$(fdisk -l rpi-os.img | awk '/^rpi-os.img2/ { print $2 }')
35+
OFFSET=$((START_SECTOR * SECTOR_SIZE))
36+
echo "OFFSET=$OFFSET" >> $GITHUB_ENV
37+
3238
sudo mkdir boot
33-
sudo mount -o loop,offset=541065216 rpi-os.img boot
39+
sudo mount -o loop,offset=${{ env.OFFSET }} rpi-os.img boot
3440
sudo tar -C boot -cf rpi-rootfs.tar .
3541
docker import rpi-rootfs.tar rpi-docker-image
3642
sudo umount boot

.github/workflows/qemu_build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,13 @@ jobs:
4444
wget -q https://downloads.raspberrypi.org/raspios_lite_arm64_latest -O rpi-os.img.xz
4545
xz -d rpi-os.img.xz
4646
47+
SECTOR_SIZE=512
48+
START_SECTOR=$(fdisk -l rpi-os.img | awk '/^rpi-os.img2/ { print $2 }')
49+
OFFSET=$((START_SECTOR * SECTOR_SIZE))
50+
echo "OFFSET=$OFFSET" >> $GITHUB_ENV
51+
4752
sudo mkdir boot
48-
sudo mount -o loop,offset=4194304 rpi-os.img boot
53+
sudo mount -o loop,offset=${{ env.OFFSET }} rpi-os.img boot
4954
5055
cp boot/kernel8.img kernel8.img
5156
cp boot/bcm2710-rpi-3-b-plus.dtb custom.dtb

0 commit comments

Comments
 (0)