From nobody Wed Apr 17 05:43:59 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 4VK8wb6BStz5HvFZ; Wed, 17 Apr 2024 05:43:59 +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 4VK8wb3Dftz4lS8; Wed, 17 Apr 2024 05:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332639; 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=477hn5FhHNmmhOCqfgpzHrWJg9STWF3251F1ZH8EUsg=; b=KeWZt/MoXUOy4xeVkdXMN47tiWnrIPo/ltQFBfUmcyoABsuSVT+LMBdDkk4hlIK/farzVg CY3bDL6528dzIJ6ptAMOvjy7Jhq10Rc1ht4Oz0u7khOnDAIJ5w8lEjCHIkv3yHrmwWs6UC wNmalmSJjdlrWd/lp7uRAtBebjbfeJzdK60HtrAMSSkSC8QH6z0hJHURp+dXekM/s3yIPj jeQvvq3XshozcBi3DXi8i9dRnbc5MP9LTA1As71lzbibqpR9s0cJQ79Hmb9FjRW5h2E04d KVsUCZ2SxYYRtXdrHLyN0GvKvOyKNMiHkSOJ0BRAfDomedn49PwK/fjEtlvnww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332639; a=rsa-sha256; cv=none; b=n8YTiO/kCn88L3GYfvXhwaxPd535EElbXdtTPnWRtt5VSZAeJ0HIwUJ1kJ86/smw2kTZXy Bi5emOFXXmQribVWYksKeAvH3alF99NEa+F5TQ2x/OtN7vJDJq5ELSEAv3adY+PRsuqXgC nDNtXa8U6GXW7/pA7clJViDenErwy1NyvVkt7iAnPObqPTDG3/Lvg1u+luaKsylvxuhs9f Csqqy/gt/1WjWD0mtQJCg32G9jCthYyOzg0ylBzd4qwt255Y7hAwi0szvdEr4CdD2Tq0/E I25mhtEYHITVlOhiSId4JRS0M4PUB7z/mJXgMxdg5+gmh3FAP0ExlU354V2d0w== 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=1713332639; 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=477hn5FhHNmmhOCqfgpzHrWJg9STWF3251F1ZH8EUsg=; b=qjwiDEqwV9EatRoNoCazMBBQPQ4q6bVo3uUqinzghZhOeBZXoLS/fIRZXcczUgjzDIHEW9 7IXq2NIsnsLoMg9a9P94Y+IQQEjaOtw27FQ/y+zWLFDtgcJ/Y91cjFiPrLzCleKRRLN9DS d+TLfeMVwz1N/msTtZeWlf2aGtDmFX3VE2rkrw7E34KCflnhEQHow7OHSfxqgfnNIbjdkT K5aXVe6BJEhRs3+fR5PQFN2fLfMafFfgAfxJbNqL6zldiNnu85z62nYKRKJ7hza+4biiJD t8g8XGi6IriNKxvDLvk17nF7WGwphydJxnmzexE9GEO1dwndgg2wb5ubyXVIoQ== 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 4VK8wb2s9LzF06; Wed, 17 Apr 2024 05:43:59 +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 43H5hx1t006902; Wed, 17 Apr 2024 05:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5hxwj006899; Wed, 17 Apr 2024 05:43:59 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:59 GMT Message-Id: <202404170543.43H5hxwj006899@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: 434dc04e34c0 - stable/14 - release: Randomize powerpc boot block file name 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: 434dc04e34c04a7a1c081902ab569051458d473f Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=434dc04e34c04a7a1c081902ab569051458d473f commit 434dc04e34c04a7a1c081902ab569051458d473f Author: Colin Percival AuthorDate: 2024-04-12 17:42:05 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:27 +0000 release: Randomize powerpc boot block file name With parallel builds enabled, we can end up building multiple ISOs at once, which causes problems if mkisoimages.sh uses a consistent file name "/tmp/hfs-boot-block". MFC after: 3 days (cherry picked from commit 6c3e01bf8578de54abc019832d799de80da7378c) --- release/powerpc/mkisoimages.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh index 8a802e6c62ae..e030ee41691c 100644 --- a/release/powerpc/mkisoimages.sh +++ b/release/powerpc/mkisoimages.sh @@ -67,14 +67,15 @@ fi if [ -n "$bootable" ]; then echo "Building bootable disc" + BOOTBLOCK=$(mktemp /tmp/hfs-boot-block.XXXXXX) + # Apple boot code - uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu" - bzip2 -d /tmp/hfs-boot-block.bz2 - OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ') + uudecode "`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=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc + dd if="$BASEBITSDIR/boot/loader" of=$BOOTBLOCK seek=$OFFSET conv=notrunc - bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot" + bootable="-o bootimage=macppc;$BOOTBLOCK -o no-emul-boot" # pSeries/PAPR boot code mkdir -p "$BASEBITSDIR/ppc/chrp" @@ -108,7 +109,9 @@ if [ -n "${METALOG}" ]; then fi makefs -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@" rm -f "$BASEBITSDIR/etc/fstab" -rm -f /tmp/hfs-boot-block +if [ n "$bootable" ]; then + rm $BOOTBLOCK +fi rm -rf "$BASEBITSDIR/ppc" if [ -n "${METALOG}" ]; then rm ${metalogfilename}