From nobody Sat Apr 13 00:52:36 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 4VGZfD45JGz5GVcK; Sat, 13 Apr 2024 00:52:36 +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 4VGZfD3Mwkz55kW; Sat, 13 Apr 2024 00:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712969556; 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=zZ2mUSncA9MsYW369uaLE8uCYYi6qyHCJOZUU9KcuZw=; b=wUzGAc5jotdJujR84Kb/k63Xq3IhUWJvawFJt0eAXxfiAp7LfQPy463JBkP2OhVJ3ePAoi i8XRrQ5zY+4X+otTqm89dev0tzjL43aBrEwWruzqkTc+p7luAIK7Di+zxPjd0OebY1BlRD MNr8JIFXJsU0Rab9A8OBGQeZw5VKDd4Jkx5feD+M4nT9/3Zz8VyR7zC1meXsGLNr83FwgW 4wbHmxcHjO0WnLKPApVvi1mzugkKUrebCrVWLQPEGFqeW0Icana5NRs/1VXsbdW6Z6Lop0 bygIzfvONH4xBpTzbALzRzevZbgXMfUOpS4x1wbWlFLfJ2wJ1xOYOoaOoUL4Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712969556; a=rsa-sha256; cv=none; b=vHZYlVjN9uxO8cmHlsN62pzLR6PRPCGGgf3/ug7QqqCEnIWu6BdTTeZE0/PUR/ylOpzzr0 x/4SR4S9OfjzJ26FJzvln38V83aZu/Bbhp9EhG2Gj22GKFJUZ7ILTBR6fa4/0LSiepq30p Oyt9yWE8uBNAZ2ptdoYGyahf3WdUT72vU9Qgs+nLb8J7hlOGuCg692q/zcSLD9wzCjQZhe 9Bzc5+3uviIk2Bq5QsPOjJ2OrybdlrpX0qOze1EW24dL3981+fi22xHe0Y/dvQx0muKZ4j yQAUdIzLLS4e8yRv0Wnhl7rHxKwRhY7lpQKUb0WOJER2D0NK4Drpx3z2lt5Hiw== 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=1712969556; 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=zZ2mUSncA9MsYW369uaLE8uCYYi6qyHCJOZUU9KcuZw=; b=Mfoi5wD3DAte1UzjIr45AJLiTkjHnMhvhrRJqHMinDgoPV7oHQgZU1w+4WRcHUSLwipyTt ZdoYFkHgXltQDn0G2k2IrmfGkbvAXdKviwG4kqjvkjuXaArp4VkQRzemWbUF4zEpo3AMhc 8wS24ZUWYaD53ujxoNdoPCcCEvwhY6+k1EMrwwJ3D8YpHR0NyKw8q1ZbmrmCU0oOEUOoeQ q2Bz8Q8jsf033SZWqVqssf5xTIhzL8BKsBAVewtpMgR0WLXk3ALp/9crIe5EJnmEjgoJnh hOmmLGaO/nxgeMzgeAFxIGokKLllFE6pmFsw7kVIzs0rq/j42dnpZIo/dtx1LQ== 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 4VGZfD2zWYz19wj; Sat, 13 Apr 2024 00:52:36 +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 43D0qauB054663; Sat, 13 Apr 2024 00:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43D0qaOH054660; Sat, 13 Apr 2024 00:52:36 GMT (envelope-from git) Date: Sat, 13 Apr 2024 00:52:36 GMT Message-Id: <202404130052.43D0qaOH054660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4d7174b1d91f - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: 4d7174b1d91ff3651ef78987d93989a40a4facd2 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4d7174b1d91ff3651ef78987d93989a40a4facd2 commit 4d7174b1d91ff3651ef78987d93989a40a4facd2 Author: Colin Percival AuthorDate: 2024-04-13 00:50:15 +0000 Commit: Colin Percival CommitDate: 2024-04-13 00:52:28 +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 --- 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