Date: Fri, 16 Jan 2026 06:26:38 +0000 From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4b5b8d69b23a - stable/15 - powerpc: fix release image building for Apple partitions Message-ID: <6969da1e.3f4b1.1a2afc31@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=4b5b8d69b23a73e932a8d46829b1ec65ba50be36 commit 4b5b8d69b23a73e932a8d46829b1ec65ba50be36 Author: Adrian Chadd <adrian@FreeBSD.org> AuthorDate: 2026-01-11 03:59:41 +0000 Commit: Adrian Chadd <adrian@FreeBSD.org> CommitDate: 2026-01-16 06:26:30 +0000 powerpc: fix release image building for Apple partitions 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 (cherry picked from commit 7afa03963c448a14b1735a10eaf84941b0b74862) --- release/powerpc/mkisoimages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh index 705545dead4b..ac02e2513e93 100644 --- a/release/powerpc/mkisoimages.sh +++ b/release/powerpc/mkisoimages.sh @@ -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"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6969da1e.3f4b1.1a2afc31>