From nobody Wed Apr 17 05:44:00 2024 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 4VK8wc6N5Pz5Hv5H; Wed, 17 Apr 2024 05:44:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK8wc4JJ0z4lbC; Wed, 17 Apr 2024 05:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332640; 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=0Wp+xrupSGCJ8Jwghv+0v9r2MEVP3mJa2b+u2UWe6eU=; b=bcJWHnBDycNsV07xhqpln6mHdkILhK19+sKwudMP/dVnST6jdD0k3bXijFLZRNhWcYPYeE Xf0zSpVqs10TBWOhkCOaPimDH7XNaMabRNQn7v0Is4+KToTHXxQ/PYDDNMEBfdTZbUXWiE m9wCLpvpoJiHqBY+K3dakcIjN5xr6wGGYwSbW+yux8Qh/CwU9C9eThcV4V2uCoM+Ejrpz9 q2Y1tDl23syEGfQdBn56EzYoJLvb1wjqRRDI3EaVRCBShtw/Nkj4fCL/azU0L3YSnanWOm 01txqouecy3j4Kt4Ng8gYfwkk/AUn/hD04CzJpuqT/kuHpXZ04D5xb8PoYx7xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332640; a=rsa-sha256; cv=none; b=iEp2sOzY+1q52q3Vx3UFUsYhoJW7teIjBPhD9DO3rNkPGA7vC0kdtK8F353zMjuiAurEw4 CtOB+g4aja3epX5v8YnK1XQC59pxTpDwM4Lxad/gqJyUI6Js+EwZ5B4Tzh8glGuAYBD50Z 7prf7T9pwcpSDd1xmPjI0tx8TKrim5A0vTkv+OayDW0U9MuFF9k99zjeujpo3jFaJap8AU 95hqpQpLQG2wvMRB8PWkgV0B0izF/k9XR5GUlwEK4kL8hAMeT7KyOTbUsgwZY55sYjkWs2 Vyf9Zl3zUI3RZwm9LwtaStVUrWlZXD5FrjC+Xpk1OmzApxRwqVFxWQqKJQG/TQ== 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=1713332640; 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=0Wp+xrupSGCJ8Jwghv+0v9r2MEVP3mJa2b+u2UWe6eU=; b=cX7+6tKfEwGH1IuGY+CCShiHRQHaUCV8GbBVV6MtCbupMJibJO/1vJoKhN+kr2J2nSHNFL 8OLVdly+lCpE36feBgsy75+nPo3iIUFur78fhScfIT7nPygeIyRt4mnbW3nG8BWId0XxG1 uYfB1w/xrn/DG+k3RmKIwzrGMSeMwSOMfsw6WBCYsBUQIeSBWLXDSsFN9sjAI9byD2z+kA wkV6mvKGsheCtu3cQUoskB3VWI0qIYvjDhNCyH3bpjn8+1CKIN3s0OQNEvwam+L9833hqC /x58S6ZTE7vf4+43f74sxhas1rzAAfsh8J2vvaFbcRUW5blChuHSquUpgSASFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK8wc3wRCzFPl; Wed, 17 Apr 2024 05:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H5i0j7006974; Wed, 17 Apr 2024 05:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5i0fj006971; Wed, 17 Apr 2024 05:44:00 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:44:00 GMT Message-Id: <202404170544.43H5i0fj006971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 449dc2854000 - stable/14 - release: Fix powerpc boot block uudecoding 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 449dc2854000a7bc7ca8e06bf7381a840d9e4b5f Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=449dc2854000a7bc7ca8e06bf7381a840d9e4b5f commit 449dc2854000a7bc7ca8e06bf7381a840d9e4b5f Author: Colin Percival AuthorDate: 2024-04-13 00:50:15 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:27 +0000 release: Fix powerpc boot block uudecoding Confusingly, uuencode writes to stdout by default, but uudecode does not. Fixes: 6c3e01bf8578 "release: Randomize powerpc boot block file name" MFC after: 3 days (cherry picked from commit 4d7174b1d91ff3651ef78987d93989a40a4facd2) --- 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 e030ee41691c..ba7c32f87bee 100644 --- a/release/powerpc/mkisoimages.sh +++ b/release/powerpc/mkisoimages.sh @@ -70,7 +70,7 @@ if [ -n "$bootable" ]; then BOOTBLOCK=$(mktemp /tmp/hfs-boot-block.XXXXXX) # Apple boot code - uudecode "`dirname "$0"`/hfs-boot.bz2.uu" | bunzip2 > $BOOTBLOCK + 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);}') dd if="$BASEBITSDIR/boot/loader" of=$BOOTBLOCK seek=$OFFSET conv=notrunc