From nobody Fri Jan 30 05:06:35 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 4f2PB34xMXz6Qc4m for ; Fri, 30 Jan 2026 05:06:35 +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 4f2PB33bHtz3ptD for ; Fri, 30 Jan 2026 05:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769749595; 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=ojfzruQ4OBeRfXZvFYhdOUEUVQHqesDfWVXUZ7PMpyo=; b=V+OOA3tH5tWD0ebXi/YB/2Ij2yu89XiwTkIRtH7LusKUXaoc9H/S25nU2Ohzb6BfVPWbRj G+JReYcTBsFma67z8rjJwVqT+m9wWemG5w6lQ+XbdyE8NQwF0GmCM4ZkhSJeDxnvUmRNph 2LA66q3i00hHpKHGqtsuNxEAOrUaBEN2/D4UWXEvssi90/F2S+qoJF3bMaH+f5eCYvLXMU ZIy05+h5jZTWgq8kA0mRYzSoYodBNEXSVI7yYBCcN+i8XqtzA0CCq/UWmeJsNBW4EE2bD5 pjS1GqwgO8/PvAPVR3QlIFLDgPUr3XrVsDvmSmrEwOr+PAgf5MvK2lEK1hvtgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769749595; a=rsa-sha256; cv=none; b=faFLbjIKmiTrZIdGVrbYLFh6oKvJDWvi/k4bK8Pd1d6t+jLgO9rGGxGZoX2B1oXPxGPXls PbvvqSUXvGgs0YySnia9PAinnOV0Ocuyu96FqKg5nuuilqK6IE0sz+cxHvLITRN81RPB1w 9akGHr9RwQJt44QS4WGVVZsjrL4/MzxqN3G5Gl1EuM7XNeJanfCvSWTQzputTyDBib9v7m 2cW2x0NN3JB45rSCjIEv4TlRCx8CfrMMJiKcuoUMCsGX3jnSBjXLaTHjXKftXOcu0lajRN xIxfzNelqw3WNOHlxaOQdwHEpQbS+gkYYeT+liXgoqamSjkXK9fYsoZ+EsoRSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769749595; 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=ojfzruQ4OBeRfXZvFYhdOUEUVQHqesDfWVXUZ7PMpyo=; b=VOrOz9rUbfFa4HJ9lyR0DGdhhvVRMNDcqbE+BneL++UVksVS/4KdAxpg1u4gJl3XH99HvW c60lfO2ROumxjqFHIQnnm+YKiFUzxVi/a0OkRkhHkKy5i26+zr4KJjdE6Qezpcy2lnWh7m aV1ODl8MQYAwmF8vDc9mTXP2hcZGSyqGosbq+tWIJyARIaXCFrr1I9B+AReBHesnneAh99 cdDAv3BYwwwJPXQTIvVpTXLMWkPQwOPsNDPe4N44V/oB78y0522nrE6cr5iKi2EzZSkb2s D+JTk2ahwjMJ2CCBCF7PtHKQAonWWski9KEJhjg/MQO+6QlJ4Fs7gCtXf3/SEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f2PB337Nfz18Rb for ; Fri, 30 Jan 2026 05:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 400d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Jan 2026 05:06:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Adrian Chadd Subject: git: 8baa4e964719 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 8baa4e9647192e476a0a14a796e36aef6ea4607e Auto-Submitted: auto-generated Date: Fri, 30 Jan 2026 05:06:35 +0000 Message-Id: <697c3c5b.400d5.7121becc@gitrepo.freebsd.org> The branch stable/14 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8baa4e9647192e476a0a14a796e36aef6ea4607e commit 8baa4e9647192e476a0a14a796e36aef6ea4607e Author: Adrian Chadd AuthorDate: 2026-01-11 03:59:41 +0000 Commit: Adrian Chadd CommitDate: 2026-01-30 05:06:09 +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 62656cdaaede..a526d6d20445 100644 --- a/release/powerpc/mkisoimages.sh +++ b/release/powerpc/mkisoimages.sh @@ -72,7 +72,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"