git: 483ef23ebb72 - main - release: Consistently use variables for invoking certain tools

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bojan Novković <bnovkov_at_FreeBSD.org>
Date: Wed, 16 Jul 2025 15:08:37 UTC
The branch main has been updated by bnovkov:

URL: https://cgit.FreeBSD.org/src/commit/?id=483ef23ebb7235059c30db86588e178cdeb80097

commit 483ef23ebb7235059c30db86588e178cdeb80097
Author:     Bojan Novković <bnovkov@FreeBSD.org>
AuthorDate: 2025-06-24 15:17:36 +0000
Commit:     Bojan Novković <bnovkov@FreeBSD.org>
CommitDate: 2025-07-16 15:04:03 +0000

    release: Consistently use variables for invoking certain tools
    
    This change cleans up the inconsistent ways of invoking makefs and mkimg
    by making sure that these tools are invoked through their corresponding
    variables. This was previously only used in a few amd64 and arm64 release
    scripts.
    
    Sponsored by:   Klara, Inc.
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D51039
    Reviewed by:    emaste, markj
---
 release/amd64/make-memstick.sh |  7 ++++---
 release/amd64/mkisoimages.sh   | 13 +------------
 release/arm64/make-memstick.sh |  5 +++--
 release/arm64/mkisoimages.sh   | 13 +------------
 release/i386/make-memstick.sh  |  9 ++++++---
 release/i386/mkisoimages.sh    |  5 ++++-
 release/powerpc/mkisoimages.sh |  5 ++++-
 release/riscv/make-memstick.sh |  5 +++--
 release/riscv/mkisoimages.sh   | 13 +------------
 release/tools/vmimage.subr     |  7 ++++---
 10 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
index cbb80e971343..cec4b27b5b96 100755
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -12,6 +12,7 @@
 set -e
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
 if [ "$(uname -s)" = "FreeBSD" ]; then
@@ -51,7 +52,7 @@ if [ -n "${METALOG}" ]; then
 	echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 	MAKEFSARG=${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
 rm ${BASEBITSDIR}/etc/fstab
 rm ${BASEBITSDIR}/etc/rc.conf.local
 if [ -n "${METALOG}" ]; then
@@ -67,10 +68,10 @@ else
 	make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi
 fi
 
-mkimg -s mbr \
+${MKIMG} -s mbr \
     -b ${BASEBITSDIR}/boot/mbr \
     -p efi:=${espfilename} \
-    -p freebsd:-"mkimg -s bsd -b ${BASEBITSDIR}/boot/boot -p freebsd-ufs:=${2}.part" \
+    -p freebsd:-"${MKIMG} -s bsd -b ${BASEBITSDIR}/boot/boot -p freebsd-ufs:=${2}.part" \
     -a 2 \
     -o ${2}
 rm ${espfilename}
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index 245beb660c3f..8f7163e05261 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -25,20 +25,9 @@
 set -e
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
-if [ -z $ETDUMP ]; then
-	ETDUMP=etdump
-fi
-
-if [ -z $MAKEFS ]; then
-	MAKEFS=makefs
-fi
-
-if [ -z $MKIMG ]; then
-	MKIMG=mkimg
-fi
-
 if [ "$1" = "-b" ]; then
 	MAKEFSARG="$4"
 else
diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh
index 90ff98b394c7..0da59c29635b 100755
--- a/release/arm64/make-memstick.sh
+++ b/release/arm64/make-memstick.sh
@@ -17,6 +17,7 @@ if [ "$(uname -s)" = "FreeBSD" ]; then
 fi
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
 if [ $# -ne 2 ]; then
@@ -51,7 +52,7 @@ if [ -n "${METALOG}" ]; then
 	echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 	MAKEFSARG=${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
 rm ${BASEBITSDIR}/etc/fstab
 rm ${BASEBITSDIR}/etc/rc.conf.local
 if [ -n "${METALOG}" ]; then
@@ -62,7 +63,7 @@ fi
 espfilename=$(mktemp /tmp/efiboot.XXXXXX)
 make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi
 
-mkimg -s gpt \
+${MKIMG} -s gpt \
     -p efi:=${espfilename} \
     -p freebsd-ufs:=${2}.part \
     -o ${2}
diff --git a/release/arm64/mkisoimages.sh b/release/arm64/mkisoimages.sh
index cb58178ed4b9..46b16f0ce08d 100644
--- a/release/arm64/mkisoimages.sh
+++ b/release/arm64/mkisoimages.sh
@@ -21,20 +21,9 @@
 set -e
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
-if [ -z $ETDUMP ]; then
-	ETDUMP=etdump
-fi
-
-if [ -z $MAKEFS ]; then
-	MAKEFS=makefs
-fi
-
-if [ -z $MKIMG ]; then
-	MKIMG=mkimg
-fi
-
 if [ "$1" = "-b" ]; then
 	MAKEFSARG="$4"
 else
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 7a20be20c026..ad2126b0a8f8 100755
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -11,6 +11,9 @@
 
 set -e
 
+scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
+
 if [ "$(uname -s)" = "FreeBSD" ]; then
 	PATH=/bin:/usr/bin:/sbin:/usr/sbin
 	export PATH
@@ -48,16 +51,16 @@ if [ -n "${METALOG}" ]; then
 	echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 	MAKEFSARG=${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
 rm ${BASEBITSDIR}/etc/fstab
 rm ${BASEBITSDIR}/etc/rc.conf.local
 if [ -n "${METALOG}" ]; then
 	rm ${metalogfilename}
 fi
 
-mkimg -s mbr \
+${MKIMG} -s mbr \
     -b ${BASEBITSDIR}/boot/mbr \
-    -p freebsd:-"mkimg -s bsd -b ${BASEBITSDIR}/boot/boot -p freebsd-ufs:=${2}.part" \
+    -p freebsd:-"${MKIMG} -s bsd -b ${BASEBITSDIR}/boot/boot -p freebsd-ufs:=${2}.part" \
     -o ${2}
 rm ${2}.part
 
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index 8f000aae3b17..1918b36eeb44 100644
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -24,6 +24,9 @@
 
 set -e
 
+scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
+
 if [ "$1" = "-b" ]; then
 	MAKEFSARG="$4"
 else
@@ -67,7 +70,7 @@ if [ -n "${METALOG}" ]; then
 	echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 	MAKEFSARG=${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@"
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@"
 rm -f "$BASEBITSDIR/etc/fstab"
 if [ -n "${METALOG}" ]; then
 	rm ${metalogfilename}
diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh
index ba7c32f87bee..9d83390f1a4e 100644
--- a/release/powerpc/mkisoimages.sh
+++ b/release/powerpc/mkisoimages.sh
@@ -24,6 +24,9 @@
 
 set -e
 
+scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
+
 if [ "$1" = "-b" ]; then
 	MAKEFSARG="$4"
 else
@@ -107,7 +110,7 @@ echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
 if [ -n "${METALOG}" ]; then
 	echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@"
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@"
 rm -f "$BASEBITSDIR/etc/fstab"
 if [ n "$bootable" ]; then
 	rm $BOOTBLOCK
diff --git a/release/riscv/make-memstick.sh b/release/riscv/make-memstick.sh
index 90ff98b394c7..0da59c29635b 100755
--- a/release/riscv/make-memstick.sh
+++ b/release/riscv/make-memstick.sh
@@ -17,6 +17,7 @@ if [ "$(uname -s)" = "FreeBSD" ]; then
 fi
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
 if [ $# -ne 2 ]; then
@@ -51,7 +52,7 @@ if [ -n "${METALOG}" ]; then
 	echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 	MAKEFSARG=${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${MAKEFSARG}
 rm ${BASEBITSDIR}/etc/fstab
 rm ${BASEBITSDIR}/etc/rc.conf.local
 if [ -n "${METALOG}" ]; then
@@ -62,7 +63,7 @@ fi
 espfilename=$(mktemp /tmp/efiboot.XXXXXX)
 make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi
 
-mkimg -s gpt \
+${MKIMG} -s gpt \
     -p efi:=${espfilename} \
     -p freebsd-ufs:=${2}.part \
     -o ${2}
diff --git a/release/riscv/mkisoimages.sh b/release/riscv/mkisoimages.sh
index cb58178ed4b9..46b16f0ce08d 100644
--- a/release/riscv/mkisoimages.sh
+++ b/release/riscv/mkisoimages.sh
@@ -21,20 +21,9 @@
 set -e
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
-if [ -z $ETDUMP ]; then
-	ETDUMP=etdump
-fi
-
-if [ -z $MAKEFS ]; then
-	MAKEFS=makefs
-fi
-
-if [ -z $MKIMG ]; then
-	MKIMG=mkimg
-fi
-
 if [ "$1" = "-b" ]; then
 	MAKEFSARG="$4"
 else
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index ce0ea03c096c..eb816018e9d3 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -6,6 +6,7 @@
 #
 
 scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
 export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
@@ -209,11 +210,11 @@ buildfs() {
 
 	case "${VMFS}" in
 	ufs)
-		cd ${DESTDIR} && makefs ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \
+		cd ${DESTDIR} && ${MAKEFS} ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \
 			${VMBASE} .${NO_ROOT:+/METALOG}
 		;;
 	zfs)
-		cd ${DESTDIR} && makefs -t zfs ${MAKEFSARGS} \
+		cd ${DESTDIR} && ${MAKEFS} -t zfs ${MAKEFSARGS} \
 			-o poolname=zroot -o bootfs=zroot/ROOT/default -o rootpath=/ \
 			-o fs=zroot\;mountpoint=none \
 			-o fs=zroot/ROOT\;mountpoint=none \
@@ -342,7 +343,7 @@ vm_create_disk() {
 	buildfs
 
 	echo "Building final disk image...  Please wait."
-	mkimg -s ${PARTSCHEME} -f ${VMFORMAT} \
+	${MKIMG} -s ${PARTSCHEME} -f ${VMFORMAT} \
 		${BOOTPARTS} \
 		${SWAPOPT} \
 		${CONFIG_DRIVE} \