From nobody Fri Jan 16 06:26:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dsqct5Dv4z6Nq4N for ; Fri, 16 Jan 2026 06:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsqct4VHpz3HCw for ; Fri, 16 Jan 2026 06:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768544798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5A8NFNkve4z1RbDaWgXPQpfYDh/Ca1LC4ViFKyh1SI=; b=EaJlO14ryp6huynMKGHFV7VysorDWwyCzA0+ls2LztmNAA450KlO+Ghmdk1uH6/A2ortZP b3DTRjC9whYBnF46vsgg1gQKT85GXwMpSksQYxAd2oXb1RRz4QcLrApvdgTIcm5v4OWk3u BhfIjQWcmp5UmolETwA0RUyKJvuO2LLOEDb78QQmsv9pkYkFPfRCJqhO2Hesp1VcBQm50K NLlsTSPpN0+SeBpQ6WWHx1+FokMzPbvFQJHUxB6Ow5b+ioDPLdMw75hi9CX37cKFdcA2kE /cV0rIfnaQOrhnCxjUPu9VacKSRNcIQu0HJpDavPpi3peaxgyldZyGRMVgHicg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768544798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5A8NFNkve4z1RbDaWgXPQpfYDh/Ca1LC4ViFKyh1SI=; b=weP8UQ/u59WSEpKHGN8zmRP6BN17/ebsPHTJvVu1RWRtbOacYGtRqTFANJgnEdrxeY2QEf QOi7s01xlY5C+kw0ql48Hwo7EdZapCmcFjcxFkIZ0Kg5i0zc+Db90mt2xLx3yqAZU8ptaU ZU38GLGY9vdRBnMru9hlpyf8I8p/MUDVptTnvnEFNnKEO0hL5OO7NDYfVgehot8/9veEG6 UG8KYyBwpS9NQeSKq2d/cExu8ajj01iUwqUiQWHyRrHN58GeHPG6Z1+GV11xCxdJIWlRbl vn/41LD+ndkCbmbftMaa45nV2brINpZlooKJ/gjk/bAZsfGo8NfwKVa/hxo/Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768544798; a=rsa-sha256; cv=none; b=RTdGlp3UuADmjMVCgSX86wWyrD6ZqKUX0FB8E7W/jmbB1KjW3oWDQfktwvlKTxa+WjkgS9 qJAYe2KKyJPKnINu0y54SZxNep4W1B/rLz83gaK0Lz5DbByCNZfLEKn81HsT5BNSMFNWnZ HcMr3M3Kasi4L7FOuPgU8DdAoe94msm99gaZo1EtkKp4sMcxpx/CyiDrcxO64j90vzC1Re en5vP+foMnZI7M0ogx9AH+jZhrNIEghBQ+tjDO7/HtDiNrDOHVLRQp66UVQFSoK3o3nkFA i71Z6WIlctoayvNnevXAkr71x5aHOM/IS/0eWS1hYqd5aphQ2OWg6hWg28UY2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsqct3PT1z12PJ for ; Fri, 16 Jan 2026 06:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f4b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 06:26:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Adrian Chadd Subject: git: 4b5b8d69b23a - stable/15 - powerpc: fix release image building for Apple partitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4b5b8d69b23a73e932a8d46829b1ec65ba50be36 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 06:26:38 +0000 Message-Id: <6969da1e.3f4b1.1a2afc31@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=4b5b8d69b23a73e932a8d46829b1ec65ba50be36 commit 4b5b8d69b23a73e932a8d46829b1ec65ba50be36 Author: Adrian Chadd AuthorDate: 2026-01-11 03:59:41 +0000 Commit: Adrian Chadd 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"