From nobody Mon Feb 28 22:41:07 2022 X-Original-To: dev-commits-src-main@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 D9FDC19E29DD; Mon, 28 Feb 2022 22:41:07 +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 4K6wMl51JQz3LnZ; Mon, 28 Feb 2022 22:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646088067; 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=QGujvhpvwtuSqJgEUUSgAXT822y5vqXBkqgsvLYzd3s=; b=vwFJouz8J4zkhrpHP6xMkhwG5+vpR78LKUNrGdvAWxdxGKLDhh6+IUT3sOS/OUD45i//2G MwInEoczSHn04Pxiibeh1Bihv65zJCvsB6u8rhifLdCgBARUX4fcahLruJ479nsXAuF/BG 0n1KmcRGy5hqwUf/GJX36qeYoVcvXzjhEla3fdm4YsxyDutU8FcIXNUxDgl6Cfd8uHL64q u5H4JSjuGlhFD68zD0RCrh1U1rydhuF/m8UsoWbY7EU+bztCbHevpTnMMZaTgKsDisApLO zRvFi5/GnzEtL5ekE5T8u7b8uxfTI//M2MjYF73+4A543vigb1YMv6TAbzPZ5A== 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 89EDA23C48; Mon, 28 Feb 2022 22:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SMf7AM062898; Mon, 28 Feb 2022 22:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SMf74w062897; Mon, 28 Feb 2022 22:41:07 GMT (envelope-from git) Date: Mon, 28 Feb 2022 22:41:07 GMT Message-Id: <202202282241.21SMf74w062897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 045c8f526484 - main - mkisoimages.sh: Avoid creating temporary files in the current directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 045c8f526484cb3b97f5fd693987f4376fa43c5f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646088067; 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=QGujvhpvwtuSqJgEUUSgAXT822y5vqXBkqgsvLYzd3s=; b=ajNpMiwsu8ILt9IrmYV+kz1ulKK8HlKnLyYV7/j+RtkeiGlcFUclRfj41Z/5RvsENor5FE hD2lVshE7aROQ2KvhcffzD4VjaxLgkakh7wb2NqZIiCRbrL0mXO1a80ssGQ6qEsUyprP/C hL/BC/Xo5zqkRhN46/vgOC2NGIVh5oW7h2ZFnWxUYxL7lR5kAVabFy/3fW9SaO4KftcZkS 04x+IQCb1MAdykuY/oyPK7509SFjmddvWtKTvzMd1wpFhyAGxfwy8X9/LahqGFK2QhIbE0 OXRnOUCJobrYG2yl09lrCs5UQ9gxViyOOo5p5Lwf2nJKZB0kjl+SgNfIfaNi7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646088067; a=rsa-sha256; cv=none; b=yV8UlrbkKCeCaa/wzjdH1n/wnlXjaFI+Ox6jFD0qxrDJi7fMA/SZlmdzS4xglE7QVWJn2m j9x1+2SkU42yH82R+skZwLYJDbhRh9SdWa7X4MPPdd6wE8rGAQd6j5bWhhmRrd5q10DkRl 2uDquh4oau7mSlamhGnar5QH3B9IJ2KwOR+ezntSjB+pngrrvvc/LTmCM/oBoWtTMytHQz IffVyrXVCaXAue6q42fpyLnVEOxYa5UVPsLAEZ0dq/HvbiS6pXHb3YQHlNt/VSVB6DZAxB fzPNFcVvvHC8mgH5OiTf6KAvl5oR+AfHqOxuwpkrmzvdljki/A+2y5MWCEr+ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=045c8f526484cb3b97f5fd693987f4376fa43c5f commit 045c8f526484cb3b97f5fd693987f4376fa43c5f Author: Jessica Clarke AuthorDate: 2022-02-28 22:36:51 +0000 Commit: Jessica Clarke CommitDate: 2022-02-28 22:36:51 +0000 mkisoimages.sh: Avoid creating temporary files in the current directory Currently the current directory is the parent of the rootfs directory, but this will change in order to support NO_ROOT builds that use a metalog manifest, since those need to have the current directory be the rootfs itself in order for the relative paths to be correct, and we do not want the non-METALOG case (which passes the directory to makefs) to pick up leftover temporary .img files from a previous failed build. Reviewed by: brooks, emaste, gjb Differential Revision: https://reviews.freebsd.org/D33998 --- release/amd64/mkisoimages.sh | 7 ++++--- release/arm64/mkisoimages.sh | 7 ++++--- release/riscv/mkisoimages.sh | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh index a9e8a2c04392..7f79ddc800e9 100644 --- a/release/amd64/mkisoimages.sh +++ b/release/amd64/mkisoimages.sh @@ -85,15 +85,16 @@ if [ "$bootable" != "" ]; then done # Create a GPT image containing the partitions we need for hybrid boot. + hybridfilename=$(mktemp /tmp/hybrid.img.XXXXXX) imgsize=`stat -f %z "$NAME"` $MKIMG -s gpt \ --capacity $imgsize \ -b "$BASEBITSDIR/boot/pmbr" \ -p freebsd-boot:="$BASEBITSDIR/boot/isoboot" \ $espparam \ - -o hybrid.img + -o $hybridfilename # Drop the PMBR, GPT, and boot code into the System Area of the ISO. - dd if=hybrid.img of="$NAME" bs=32k count=1 conv=notrunc - rm -f hybrid.img + dd if=$hybridfilename of="$NAME" bs=32k count=1 conv=notrunc + rm -f $hybridfilename fi diff --git a/release/arm64/mkisoimages.sh b/release/arm64/mkisoimages.sh index 5556336840cd..8d260883c294 100644 --- a/release/arm64/mkisoimages.sh +++ b/release/arm64/mkisoimages.sh @@ -81,13 +81,14 @@ if [ "$bootable" != "" ]; then done # Create a GPT image containing the EFI partition. + efifilename=$(mktemp /tmp/efi.img.XXXXXX) imgsize=`stat -f %z "$NAME"` $MKIMG -s gpt \ --capacity $imgsize \ $espparam \ - -o efi.img + -o $efifilename # Drop the GPT into the System Area of the ISO. - dd if=efi.img of="$NAME" bs=32k count=1 conv=notrunc - rm -f efi.img + dd if=$efifilename of="$NAME" bs=32k count=1 conv=notrunc + rm -f $efifilename fi diff --git a/release/riscv/mkisoimages.sh b/release/riscv/mkisoimages.sh index 5556336840cd..8d260883c294 100644 --- a/release/riscv/mkisoimages.sh +++ b/release/riscv/mkisoimages.sh @@ -81,13 +81,14 @@ if [ "$bootable" != "" ]; then done # Create a GPT image containing the EFI partition. + efifilename=$(mktemp /tmp/efi.img.XXXXXX) imgsize=`stat -f %z "$NAME"` $MKIMG -s gpt \ --capacity $imgsize \ $espparam \ - -o efi.img + -o $efifilename # Drop the GPT into the System Area of the ISO. - dd if=efi.img of="$NAME" bs=32k count=1 conv=notrunc - rm -f efi.img + dd if=$efifilename of="$NAME" bs=32k count=1 conv=notrunc + rm -f $efifilename fi