From nobody Sun Jan 11 07:05:15 2026 X-Original-To: dev-commits-src-all@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 4dpmjl5ZtKz6Nbrj for ; Sun, 11 Jan 2026 07:05:15 +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 4dpmjl50bBz3TNp for ; Sun, 11 Jan 2026 07:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768115115; 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=TXZciDfFWotR/qn6D0wJ9dFcG0CWQbla+7r6JVsLyMQ=; b=hyjjJJjpWXWLt8NPUSs1P8aC+DLoWclzpLf80SFf1V5my7sRAzA9YrQIK2g+46QhEoWHwh Or6A/iLEZo+34v+IwSwVbpSpVekz0VnqdYZ+l2JHD3HG0ij6EorErx4iYfIgyDe8bzbe3x n2hw2L3kOikeq6vKfJduXXqrLtf9rjVPaFWIcUnvGi8sR1SyCGBduhzqeWZdvFEfz+qSB6 1C4n4zw6ypIbQgww3SB+0ssaiR7ahfDLiyIPi6VUuHtHa9wxmxX97nCnEeLxbeyrsfxTou Q61UApkKSJ1DdaR2IRKVcD+KozFnUxg1r02+ACp02zYK2q05T46ycNyT6QGw4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768115115; 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=TXZciDfFWotR/qn6D0wJ9dFcG0CWQbla+7r6JVsLyMQ=; b=rnj9msaFMcKtdLWxwXQILpdAJsZN7o30dPS+aOemJ80sQz7hvqM5dWGX1d7OCV9TPAsxxk c8Xx5o6fohWoJ0jy+gbmrD6+3G0DMhgvL3gXaJ09tpUB2YIIvC0c5mcpdvulkyqDRvvqgK P2zXprVnuSEtFWDgyMGKUTSEVwwH7JMnjfavEBJBH0ASk6oklQrmiFBkbzZ44Oop91eXpc mnvd+1BwCbIgMxnr55AXQ3spBMFVpU6EuB/rYGt8QGUjXF2d4fG1PHE4jY1SmHuSciiR1a ocrtBvfXD+dO9jI9mIzsg1cNPVD/cNWXkl8Hucq66f4OisDhtYL7YLl77S99kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768115115; a=rsa-sha256; cv=none; b=nPJWNLAO3jK4nc5xlvMGkDuQBYsPd8JFdmY1HVzQYHIJRinQ0owhPqIM8JTISptbgvqskB jEgkE9vsoLgh9rrW5luNcfid+E0wIOuVrvGz2pih/N7PUoAWX4ssCG6bKDDrL9qObdRSOK VmnNvAeSWfuoOTDjp7m9LtPuY+o1ohEhp9s+7LHkVxsWNKriKz9vqd9DC7q3stvA7BHKTX 7jcuZ/05S2TQnolyV1wtO4PwedituZFZroBiUCroF9nr52C6u7G1JR6WNyLye9yNzqSEhR SWETpeCZ6mdf9PQ6ehdt3a4IRoOZGcCWVtpcfhzNmug2akj3Q/CVO/syzK1X+g== 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 4dpmjl3cxTzWTb for ; Sun, 11 Jan 2026 07:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de26 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Jan 2026 07:05:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7afa03963c44 - main - powerpc: fix release image building for Apple partitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7afa03963c448a14b1735a10eaf84941b0b74862 Auto-Submitted: auto-generated Date: Sun, 11 Jan 2026 07:05:15 +0000 Message-Id: <69634bab.3de26.424af035@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7afa03963c448a14b1735a10eaf84941b0b74862 commit 7afa03963c448a14b1735a10eaf84941b0b74862 Author: Adrian Chadd AuthorDate: 2026-01-11 03:59:41 +0000 Commit: Adrian Chadd CommitDate: 2026-01-11 07:04:57 +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 --- 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"