powerpc: fix release image building for Apple partitions
Some checks are pending
Cross-build Kernel / amd64 ubuntu-22.04 (clang-15) (push) Waiting to run
Cross-build Kernel / aarch64 ubuntu-22.04 (clang-15) (push) Waiting to run
Cross-build Kernel / amd64 ubuntu-24.04 (clang-18) (push) Waiting to run
Cross-build Kernel / aarch64 ubuntu-24.04 (clang-18) (push) Waiting to run
Cross-build Kernel / amd64 macos-latest (clang-18) (push) Waiting to run
Cross-build Kernel / aarch64 macos-latest (clang-18) (push) Waiting to run

awk changed somewhere between 14 and 15 and it stopped accepting
a hexadecimal number as its input - it will always return 0.
This results in a very badly written apple boot block.

So just remove it; do the math in shell.

PR:		kern/292341
Differential Revision:	https://reviews.freebsd.org/D54639
Reviewed by:	imp
MFC after:	1 week
This commit is contained in:
Adrian Chadd 2026-01-10 19:59:41 -08:00
parent 9fed072b44
commit 7afa03963c

View file

@ -75,7 +75,7 @@ if [ -n "$bootable" ]; then
# Apple boot code
uudecode -p "`dirname "$0"`/hfs-boot.bz2.uu" | bunzip2 > $BOOTBLOCK
OFFSET=$(hd $BOOTBLOCK | grep 'Loader START' | cut -f 1 -d ' ')
OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
OFFSET=$((0x${OFFSET} / 512))
dd if="$BASEBITSDIR/boot/loader" of=$BOOTBLOCK seek=$OFFSET conv=notrunc
bootable="-o bootimage=macppc;$BOOTBLOCK -o no-emul-boot"