Remove unnecessary variable wrappers

legionus · legionus · commit 939ef186a3e9 · 2025-07-19T15:02:20.000+02:00
Historically, for variables defined in make, duplicate variables have
been created for shell scripts. Now that there are quite a few variables
this has lost its meaning. Most scripts use make variables directly.

Signed-off-by: Alexey Gladkov &lt;gladkov.alexey@gmail.com&gt;
diff --git a/features/add-modules/bin/put-modules b/features/add-modules/bin/put-modules
@@ -85,17 +85,17 @@ load_modules()
 	modules_file="/etc/initrd/modules-$1"
 	shift
 
-	mkdir -p -- "$rootdir/etc/initrd"
+	mkdir -p -- "$ROOTDIR/etc/initrd"
 
 	for n; do
 		m="${n##*/}"
 		m="$(normalize_modname "${m%.ko*}")"
 		! in_blacklist "$m" ||
 			continue
 		printf '%s\n' "$n"
-	done >> "$rootdir/$modules_file"
+	done >> "$ROOTDIR/$modules_file"
 
-	sort -uo "$rootdir/$modules_file" "$rootdir/$modules_file"
+	sort -uo "$ROOTDIR/$modules_file" "$ROOTDIR/$modules_file"
 }
 
 get_depinfo()
@@ -204,7 +204,7 @@ done > "$tempdir/modules"
 cut -f2- -- "$tempdir/firmwares" "$tempdir/modules" |
 	sort -u |
 	tr '\n' '\0' |
-	xargs -r0 put-file "$rootdir"
+	xargs -r0 put-file "$ROOTDIR"
 
 if [ -s "$tempdir/missing-firmwares" ]; then
 	if [ -n "${verbose2-}" ]; then
diff --git a/features/add-udev-rules/bin/put-rules b/features/add-udev-rules/bin/put-rules
@@ -63,6 +63,6 @@ done
 find "$tempdir/etc/udev/rules.d" -name '*.rules' |
 while read -r rule; do
 	find-udev-rule-externals "$rule" |
-		xargs -r put-file "$rootdir"
+		xargs -r put-file "$ROOTDIR"
 done
-put-tree "$rootdir" "$tempdir"
+put-tree "$ROOTDIR" "$tempdir"
diff --git a/features/compress/bin/compress-image b/features/compress/bin/compress-image
@@ -16,5 +16,5 @@ case "${COMPRESS-}" in
 	*) fatal "Unknown compress method: $COMPRESS"
 esac
 
-"$@" < "$outfile" > "$outfile.x"
-mv -f -- "$outfile.x" "$outfile"
+"$@" < "$OUTFILE" > "$OUTFILE.x"
+mv -f -- "$OUTFILE.x" "$OUTFILE"
diff --git a/features/locales/bin/put-l10n b/features/locales/bin/put-l10n
@@ -31,4 +31,4 @@ for textdomain; do
 		fi
 	done
 done |
-	xargs -r put-file "$rootdir"
+	xargs -r put-file "$ROOTDIR"
diff --git a/features/locales/bin/put-locale b/features/locales/bin/put-locale
@@ -25,4 +25,4 @@ while read -r s; do
 done < <(locale -a -v |grep ^locale:)
 
 printf '%s\n' "${locales[@]}" |
-	xargs -r put-file "$rootdir"
+	xargs -r put-file "$ROOTDIR"
diff --git a/features/runtime-compressed-fs/bin/pack-compressed-fs b/features/runtime-compressed-fs/bin/pack-compressed-fs
@@ -3,14 +3,14 @@
 
 . sh-functions
 
-mkdir "$rootdir"/overlay
+mkdir "$ROOTDIR"/overlay
 
-find -P "$rootdir" -type f -execdir touch -c -m --date="1970-01-01 00:00:00 +0000" '{}' '+'
+find -P "$ROOTDIR" -type f -execdir touch -c -m --date="1970-01-01 00:00:00 +0000" '{}' '+'
 
 suffix="$RUNTIME_COMPRESSED_FS"
 
-mv -- "$rootdir" "$rootdir.$suffix"
-mkdir -- "$rootdir"
+mv -- "$ROOTDIR" "$ROOTDIR.$suffix"
+mkdir -- "$ROOTDIR"
 
 base_layer="${RUNTIME_BASE_LAYER-}"
 
@@ -27,7 +27,7 @@ case "$base_layer" in
 		kmodule_requires="${RUNTIME_LAYER_SQUASHFS_MODULES-}"
 		layerfs=squashfs
 
-		mksquashfs "$rootdir.$suffix" "$rootdir"/initramfs.img -quiet -no-progress -no-xattrs \
+		mksquashfs "$ROOTDIR.$suffix" "$ROOTDIR"/initramfs.img -quiet -no-progress -no-xattrs \
 			${RUNTIME_LAYER_SQUASHFS_ARGS-} \
 			${RUNTIME_LAYER_SQUASHFS_COMPRESS:+-comp "$RUNTIME_LAYER_SQUASHFS_COMPRESS"} \
 			-all-root \
@@ -52,7 +52,7 @@ case "$base_layer" in
 			${RUNTIME_LAYER_EROFS_ARGS=} \
 			${RUNTIME_LAYER_EROFS_COMPRESS:+-z "$RUNTIME_LAYER_EROFS_COMPRESS"} \
 			--all-root \
-			"$rootdir"/initramfs.img "$rootdir.$suffix"
+			"$ROOTDIR"/initramfs.img "$ROOTDIR.$suffix"
 		;;
 	*)
 		fatal "unknown base layer: $base_layer"
@@ -62,38 +62,38 @@ esac
 printf '%s\n' "$base_layer" > "$WORKDIR"/compressed-fs
 
 mkdir -p -- \
-	"$rootdir"/bin \
-	"$rootdir"/dev \
-	"$rootdir"/root \
-	"$rootdir"/overlay \
-	"$rootdir"/usr \
+	"$ROOTDIR"/bin \
+	"$ROOTDIR"/dev \
+	"$ROOTDIR"/root \
+	"$ROOTDIR"/overlay \
+	"$ROOTDIR"/usr \
 #
 
-ln -s -- ../bin  "$rootdir"/usr/bin
-ln -s -- ../sbin "$rootdir"/usr/bin
+ln -s -- ../bin  "$ROOTDIR"/usr/bin
+ln -s -- ../sbin "$ROOTDIR"/usr/bin
 
-put-file -r "$rootdir.$suffix" "$rootdir" "$rootdir.$suffix"/bin/busybox
+put-file -r "$ROOTDIR.$suffix" "$ROOTDIR" "$ROOTDIR.$suffix"/bin/busybox
 
-cat > "$rootdir"/init <<EOF
+cat > "$ROOTDIR"/init <<EOF
 #!/bin/busybox ash
 EOF
 
 if [ -n "$kmodule_requires" ]; then
 	depinfo --set-version="$KERNEL" --no-prefix --no-builtin \
 		$kmodule_requires | tac |
 	while read -r modname; do
-		mkdir -p -- "$rootdir/${modname%/*}"
-		cp -- "$modname" "$rootdir/$modname"
+		mkdir -p -- "$ROOTDIR/${modname%/*}"
+		cp -- "$modname" "$ROOTDIR/$modname"
 		printf '/bin/busybox insmod %s\n' "$modname"
-	done >> "$rootdir/init"
+	done >> "$ROOTDIR/init"
 fi
 
-cat >> "$rootdir"/init <<EOF
+cat >> "$ROOTDIR"/init <<EOF
 /bin/busybox mount -t ramfs ramfs /overlay
 /bin/busybox mkdir /overlay/root /overlay/upper /overlay/work
 /bin/busybox mount -t $layerfs -o loop /initramfs.img /overlay/root
 /bin/busybox mount -t overlay overlay -o lowerdir=/overlay/root,upperdir=/overlay/upper,workdir=/overlay/work /root
 /bin/busybox mount --move /overlay /root/overlay
 exec /bin/busybox switch_root /root /init
 EOF
-chmod +x "$rootdir"/init
+chmod +x "$ROOTDIR"/init
diff --git a/features/ucode/bin/add-ucode b/features/ucode/bin/add-ucode
@@ -58,10 +58,10 @@ prep_amd_ucode()
 		return 0
 	fi
 
-	mkdir "$workdir"/ucode ||
+	mkdir "$WORKDIR"/ucode ||
 		return
-	mkdir -p -- "$workdir"/ucode/kernel/x86/microcode
-	cp ${VERBOSE:+-v} -- "$fw_file" "$workdir"/ucode/kernel/x86/microcode/"$cpu_vendor".bin
+	mkdir -p -- "$WORKDIR"/ucode/kernel/x86/microcode
+	cp ${VERBOSE:+-v} -- "$fw_file" "$WORKDIR"/ucode/kernel/x86/microcode/"$cpu_vendor".bin
 }
 
 prep_intel_ucode()
@@ -78,12 +78,12 @@ prep_intel_ucode()
 			"$IUCODE_BIN" \
 					--quiet \
 					$iucode_scan_system \
-					--write-earlyfw="$workdir"/ucode.cpio \
+					--write-earlyfw="$WORKDIR"/ucode.cpio \
 					"$fw_path"/intel-ucode
-			[ -f "$workdir"/ucode.cpio ] ||
+			[ -f "$WORKDIR"/ucode.cpio ] ||
 				continue
-			mkdir "$workdir"/ucode &&
-				cpio -D "$workdir"/ucode --quiet -id < "$workdir"/ucode.cpio
+			mkdir "$WORKDIR"/ucode &&
+				cpio -D "$WORKDIR"/ucode --quiet -id < "$WORKDIR"/ucode.cpio
 			return
 		fi
 	done
@@ -102,15 +102,15 @@ rc=$?
 [ "$rc" -eq 0 ] ||
 	exit $rc
 
-if [ -d "$workdir/ucode" ]; then
-	cd "$workdir/ucode"
+if [ -d "$WORKDIR/ucode" ]; then
+	cd "$WORKDIR/ucode"
 
 	find . -type f -execdir touch -c -m --date="1970-01-01 00:00:00 +0000" '{}' '+'
 
 	# shellcheck disable=SC2185
 	find -O2 . -mindepth 1 -print0 |
 		sort -z |
-		cpio --null --quiet --create --format=newc --reproducible > "$workdir"/ucode.cpio
+		cpio --null --quiet --create --format=newc --reproducible > "$WORKDIR"/ucode.cpio
 
-	rm -rf -- "$workdir/ucode"
+	rm -rf -- "$WORKDIR/ucode"
 fi
diff --git a/features/uki/bin/pack-uki b/features/uki/bin/pack-uki
@@ -9,10 +9,10 @@ PROCFS_PATH="${PROCFS_PATH:-/proc}"
 ARCH="${ARCH:-$(uname -m)}"
 KERNEL="${KERNEL:-$(uname -r)}"
 
-outfile="${UKI_EFI_INTERNAL_IMAGE:-$workdir/linux.efi}"
+outfile="${UKI_EFI_INTERNAL_IMAGE:-$WORKDIR/linux.efi}"
 uefi_stub="${UKI_UEFI_STUB-}"
 linux="${UKI_VMLINUZ-}"
-initrd="$workdir/initrd.img"
+initrd="${OUTFILE-}"
 
 garbage=()
 
@@ -85,10 +85,10 @@ add_text_section()
 {
 	local section="$1"; shift
 
-	printf >"$workdir/uefi${section}.txt" '%s\0' "$*"
+	printf >"$WORKDIR/uefi${section}.txt" '%s\0' "$*"
 
-	add_section "$section" "$workdir/uefi${section}.txt"
-	garbage+=( "$workdir/uefi${section}.txt" )
+	add_section "$section" "$WORKDIR/uefi${section}.txt"
+	garbage+=( "$WORKDIR/uefi${section}.txt" )
 }
 
 if [ -z "$uefi_stub" ]; then
@@ -233,7 +233,7 @@ fi
 #
 # Creating UEFI image file.
 #
-uefi_stub_file="$workdir/stub.efi"
+uefi_stub_file="$WORKDIR/stub.efi"
 garbage+=( "$uefi_stub_file" )
 
 cp $verbose3 -f -- "$uefi_stub" "$uefi_stub_file"
diff --git a/guess/keyboard/action b/guess/keyboard/action
@@ -60,7 +60,7 @@ detect()
 
 detect
 
-if [ ! -s "$guessdir/guess:modalias${GUESS_SUFFIX:+:$GUESS_SUFFIX}" ]; then
+if [ ! -s "$GUESSDIR/guess:modalias${GUESS_SUFFIX:+:$GUESS_SUFFIX}" ]; then
 	[ -n "${KEYBOARD_DEFAULT_MODULES-}" ] ||
 		exit 0
 	printf '%s\n' ${KEYBOARD_DEFAULT_MODULES-} |
diff --git a/mk/config.mk.in b/mk/config.mk.in
@@ -43,6 +43,7 @@ DATADIR		:= @datadir@
 LIBDIR		:= @libdir@
 SYSFS_PATH	?= /sys
 PROCFS_PATH	?= /proc
+OUTFILE		:= $(WORKDIR)/initrd.img
 
 BIN_FEATURESDIR := @execdir@/features
 
diff --git a/tools/bug-report b/tools/bug-report
@@ -5,7 +5,6 @@
 
 PROCFS_PATH="${PROCFS_PATH:-/proc}"
 SYSFS_PATH="${SYSFS_PATH:-/sys}"
-reportdir="$workdir/report"
 
 c=/
 progress()
@@ -25,25 +24,25 @@ copy()
 	find -P "$@" -regextype egrep \! -type d |
 	while read -r filename; do
 		progress "$c"
-		mkdir -p -- "$reportdir/${filename%/*}"
+		mkdir -p -- "$REPORTDIR/${filename%/*}"
 		cp -d --preserve=all -- \
-			"$filename" "$reportdir/${filename%/*}"/ 2>/dev/null ||:
+			"$filename" "$REPORTDIR/${filename%/*}"/ 2>/dev/null ||:
 	done
 	find -P "$@" -type d -empty -exec mkdir -p -- '{}' '+' ||:
 }
 
 progress "$c"
 mkdir -p -- \
-	"$reportdir"/boot \
-	"$reportdir"/etc \
-	"$reportdir"/"$SYSFS_PATH" \
-	"$reportdir"/"$PROCFS_PATH/self" \
+	"$REPORTDIR"/boot \
+	"$REPORTDIR"/etc \
+	"$REPORTDIR"/"$SYSFS_PATH" \
+	"$REPORTDIR"/"$PROCFS_PATH/self" \
 #
 
 if [ -f "${KERNEL_CONFIG-}" ]; then
 	cp -a \
 		"$KERNEL_CONFIG" \
-		"$reportdir"/boot/
+		"$REPORTDIR"/boot/
 	progress "$c"
 fi
 
@@ -55,27 +54,27 @@ if [ -n "$kver" ]; then
 	done
 fi
 
-mkdir -p -- "$reportdir"/dev
-LANG=C find /dev -xdev -a \! -type d -exec ls -lad '{}' '+' >"$reportdir"/dev/list
+mkdir -p -- "$REPORTDIR"/dev
+LANG=C find /dev -xdev -a \! -type d -exec ls -lad '{}' '+' >"$REPORTDIR"/dev/list
 progress "$c"
 
 (
 	export LANG=C;
 	find /dev -xdev -a \! -type d -exec stat -L -c '%A %t %T %n' '{}' '+' 2>/dev/null |
 		grep -e '^[cb]' |
-		sort >"$reportdir"/dev/devlist
+		sort >"$REPORTDIR"/dev/devlist
 ) ||
-	rm -f -- "$reportdir"/dev/devlist
+	rm -f -- "$REPORTDIR"/dev/devlist
 progress "$c"
 
 blkid -c /dev/null --no-encoding --output export |
 	sed -r -e 's/^([^=]+)=/\1\t/' \
 	       -e '${ s/^.*/&\n/ }' \
-	       >"$reportdir"/etc/blkid.out1
+	       >"$REPORTDIR"/etc/blkid.out1
 findmnt -v --direction forward --pairs --output-all  |
 	sed -r -e 's/" /"\n/g' -e 's/$/\n/' |
 	sed -r -e 's/^([^=]+)="(.*)"$/\1\t\2/' \
-	       >"$reportdir"/etc/findmnt.out1
+	       >"$REPORTDIR"/etc/findmnt.out1
 progress "$c"
 
 copy \
@@ -105,7 +104,7 @@ copy \
 #
 
 [ -z "${VERSION-}" ] ||
-	printf '%s\n' "$VERSION" > "$reportdir"/.version
+	printf '%s\n' "$VERSION" > "$REPORTDIR"/.version
 progress "done"
 echo
 
@@ -126,7 +125,7 @@ fi
 
 outfile="$PWD/make-initrd-bugreport-$(date +"%Y%m%d").tar$suffix"
 
-cd "$workdir"
+cd "$WORKDIR"
 tar -cf - report | "$compress" "${compargs[@]}" >"$outfile"
 
 printf '\nPlease submit %s to authors\n\n' "$outfile"
diff --git a/tools/guess-config b/tools/guess-config
@@ -24,10 +24,10 @@ file_is_not_empty() {
 }
 
 print_vars() {
-	file_is_not_empty "$guessdir/guess:variables":* ||
+	file_is_not_empty "$GUESSDIR/guess:variables":* ||
 		return 0
 
-	for m in "$guessdir/guess:variables":*; do
+	for m in "$GUESSDIR/guess:variables":*; do
 		[ -s "$m" ] ||
 			continue
 		n="${m##*:}"
@@ -42,12 +42,12 @@ print_vars() {
 }
 
 print_list() {
-	file_is_not_empty "$guessdir/guess:$2":* "$guessdir/guess:$2" ||
+	file_is_not_empty "$GUESSDIR/guess:$2":* "$GUESSDIR/guess:$2" ||
 		return 0
 
 	printf '%s += \\\n' "$1"
 
-	for m in "$guessdir/guess:$2":* "$guessdir/guess:$2"; do
+	for m in "$GUESSDIR/guess:$2":* "$GUESSDIR/guess:$2"; do
 		[ -s "$m" ] ||
 			continue
 
@@ -75,7 +75,7 @@ print_list() {
 }
 
 if [ -n "${RESOLVE_MODALIAS-}" ]; then
-	for m in "$guessdir"/guess:modalias*; do
+	for m in "$GUESSDIR"/guess:modalias*; do
 		[ -s "$m" ] ||
 			continue
 
@@ -92,9 +92,9 @@ if [ -n "${RESOLVE_MODALIAS-}" ]; then
 				--no-firmware \
 				--no-builtin \
 			2>/dev/null |
-			sort -u >> "$guessdir/guess:modules$suffix"
+			sort -u >> "$GUESSDIR/guess:modules$suffix"
 
-		$TRACE_RESOLVE_MODALIAS "$m" "$guessdir/guess:modules$suffix"
+		$TRACE_RESOLVE_MODALIAS "$m" "$GUESSDIR/guess:modules$suffix"
 
 		rm -f "$m"
 	done
diff --git a/tools/guess-functions b/tools/guess-functions
diff --git a/tools/initrd-release b/tools/initrd-release
diff --git a/tools/pack-image b/tools/pack-image
diff --git a/tools/sh-functions b/tools/sh-functions
