Use makefile variables directly

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

features/add-modules/bin/put-modules

@@ -58,9 +58,9 @@ find_modules()
 			continue
 		fi
 
-		if [ -n "${kernel_modules_dir-}" ]; then
+		if [ -n "$KERNEL_MODULES_DIR" ]; then
 			[ -f "$tempdir/kmodules" ] ||
-				find "$kernel_modules_dir" \
+				find "$KERNEL_MODULES_DIR" \
 					-type f \
 					-a \( -name '*.ko' -o -name '*.ko.*' \) \
 					> "$tempdir/kmodules"
@@ -106,7 +106,7 @@ get_depinfo()
 	sort -u "$1" |
 		depinfo --input=- \
 			${USE_MODPROBE_BLACKLIST:+--use-blacklist} \
-			--set-version="$kernel" || rc=$?
+			--set-version="$KERNEL" || rc=$?
 	:> "$1"
 	return $rc
 }
@@ -150,7 +150,7 @@ fi
 
 if [ -n "${MODULES_PATTERN_SETS_FILES-}" ]; then
 	printf '%s\n' ${MODULES_PATTERN_SETS_FILES-} |
-		xargs -r initrd-scanmod --set-version="$kernel" \
+		xargs -r initrd-scanmod --set-version="$KERNEL" \
 		>> "$tempdir/mods.required"
 fi
 

features/add-modules/kmodule.deps.d/add-deps-ext4

@@ -11,13 +11,13 @@ modname="${PROG##add-deps-}"
 grep -E -qs '^'"$modname"'[[:space:]]' "$kmodules_list" ||
 	exit 0
 
-depinfo --set-version="$kernel" -D "$modname" 2>/dev/null |
+depinfo --set-version="$KERNEL" -D "$modname" 2>/dev/null |
 	grep -E -qs '^module ' ||
 	exit 0
 
 printf '%s\n' crc32c crc32-generic
 
-grep -E '^alias crc32c? ' "$kernel_modules_dir"/modules.alias |
+grep -E '^alias crc32c? ' "$KERNEL_MODULES_DIR"/modules.alias |
 while read -r prefix alias module; do
 	printf '%s\n' "$module"
 done

features/add-modules/kmodule.deps.d/add-deps-libcrc32c

@@ -6,7 +6,7 @@
 kmodules_list="$1"
 shift
 
-LIBCRC32C="$(depinfo --set-version="$kernel" -D "libcrc32c" 2>/dev/null |cut -f1 -d\ )"
+LIBCRC32C="$(depinfo --set-version="$KERNEL" -D "libcrc32c" 2>/dev/null |cut -f1 -d\ )"
 
 case "$LIBCRC32C" in
 	builtin) pattern='^(ext4|xfs|btrfs)[[:space:]]' ;;
@@ -20,7 +20,7 @@ grep -E -qs -e "$pattern" "$kmodules_list" ||
 # CRC32c (Castagnoli) calculations wrapper for lib/crc32c
 printf '%s\n' crc32c
 
-grep -E -e '^alias crc32c ' "$kernel_modules_dir"/modules.alias |
+grep -E -e '^alias crc32c ' "$KERNEL_MODULES_DIR"/modules.alias |
 while read -r prefix alias module; do
 	printf '%s\n' "$module"
 done

features/add-udev-rules/bin/find-udev-rule-externals

@@ -10,7 +10,7 @@ readarray -t UDEV_BUILTINS <<< "$(
 		sed -nr -e 's/^[[:space:]]+([^[:space:]]+)[[:space:]]+.*$/\1/p' |
 		sort -u
 )"
-kernel="${kernel:-$(uname -r)}"
+KERNEL="${KERNEL:-$(uname -r)}"
 
 FILES=()
 put_file()
@@ -170,7 +170,7 @@ if [ "${#MODULES[@]}" -gt 0 ]; then
 			sort -u |
 			depinfo --input=- \
 				${USE_MODPROBE_BLACKLIST:+--use-blacklist} \
-				--set-version="$kernel" \
+				--set-version="$KERNEL" \
 				--no-prefix \
 				2>/dev/null ||:
 	else

features/compress/bin/compress-image

@@ -4,7 +4,7 @@
 . sh-functions
 . shell-error
 
-case "$compress_method" in
+case "${COMPRESS-}" in
 	gzip|gz)   set -- gzip --best  ;;
 	bzip2|bz2) set -- bzip2 --best ;;
 	lz4)       set -- lz4 --best   ;;
@@ -13,7 +13,7 @@ case "$compress_method" in
 	xz)        set -- xz --best --check=crc32 -T0 ;;
 	zstd)      set -- zstd -19 -T0 ;;
 	'')        exit 0              ;;
-	*) fatal "Unknown compress method: $compress_method"
+	*) fatal "Unknown compress method: $COMPRESS"
 esac
 
 "$@" < "$outfile" > "$outfile.x"

features/compress/guess/common

@@ -3,12 +3,12 @@
 
 . guess-functions
 
-if [ ! -f "$imagefile" ]; then
+if [ ! -f "${IMAGEFILE-}" ]; then
 	guess_feature compress
 	exit 0
 fi
 
-init="$(initrd-ls -nC "$imagefile" |grep ' \./init$' |tail -1)"
+init="$(initrd-ls -nC "$IMAGEFILE" |grep ' \./init$' |tail -1)"
 
 for method in gzip bzip2 xz lzma lzo lz4 zstd; do
 	if [ -z "${init##* $method *}" ]; then

features/mdadm/guess/device

@@ -24,7 +24,7 @@ fi
 
 if [ -n "${RESOLVE_MODALIAS-}" ]; then
 	depinfo \
-			--set-version="$kernel" \
+			--set-version="$KERNEL" \
 			--no-builtin \
 			--no-prefix \
 			--no-firmware \

features/plymouth/bin/get-modules

@@ -10,5 +10,5 @@ f="$SYSFS_PATH"/class/graphics/fb0/device/modalias
 modalias=
 readline modalias "$f"
 
-depinfo --set-version="$kernel" --no-prefix --no-firmware "$modalias" 2>/dev/null |
+depinfo --set-version="$KERNEL" --no-prefix --no-firmware "$modalias" 2>/dev/null |
 	sort -u

tools/guess-config

@@ -81,7 +81,7 @@ if [ -n "${RESOLVE_MODALIAS-}" ]; then
 		depinfo \
 				--input="$m" \
 				${USE_MODPROBE_BLACKLIST:+--use-blacklist} \
-				--set-version="$kernel" \
+				--set-version="$KERNEL" \
 				--no-deps \
 				--no-prefix \
 				--no-firmware \

tools/sh-functions

@@ -14,18 +14,16 @@ export workdir="${WORKDIR:?Work directory required}"
 export rootdir="${ROOTDIR:?Root directory required}"
 export guessdir="${GUESSDIR:?Autodetect directory required}"
 export reportdir="${REPORTDIR:?Bug report directory required}"
-export imagefile="${IMAGEFILE-}"
-export modules_ignore=" ${MODULES_IGNORE-} "
-
-export compress_method="${COMPRESS-}"
 export outfile="$workdir/initrd.img"
-export kernel="${KERNEL:?}"
-export kernel_modules_dir="${KERNEL_MODULES_DIR:?}"
 
-kernel_major="${kernel%%.*}"
-kernel_minor="${kernel#*.}"
+: ${KERNEL:?kernel version required}
+
+kernel_major="${KERNEL%%.*}"
+
+kernel_minor="${KERNEL#*.}"
 kernel_minor="${kernel_minor%%.*}"
-kernel_patch="${kernel#*.*.}"
+
+kernel_patch="${KERNEL#*.*.}"
 kernel_patch="${kernel_patch%%[!0-9]*}"
 
 export kernel_major kernel_minor kernel_patch
@@ -34,11 +32,13 @@ if [ -z "${kernel_major##*[!0-9]*}" ] ||
    [ -z "${kernel_minor##*[!0-9]*}" ] ||
    [ -z "${kernel_patch##*[!0-9]*}" ]
 then
-	fatal "Invalid kernel version \"$kernel\""
+	fatal "Invalid kernel version \"$KERNEL\""
 fi
 
-[ -d "$kernel_modules_dir" ] ||
-	fatal "Directory \"$kernel_modules_dir\" doesn't exist or not accessible."
+: ${KERNEL_MODULES_DIR:?kernel modules directory required}
+
+[ -d "$KERNEL_MODULES_DIR" ] ||
+	fatal "Directory \"$KERNEL_MODULES_DIR\" doesn't exist or not accessible."
 
 get_majmin() {
 	local v devnode
@@ -164,7 +164,7 @@ if [ -n "${MAKE_INITRD_TRACE-}" ]; then
 
 		kmodules=()
 		while read -r m; do
-			kmodules+=("${m##/lib/modules/$kernel/}")
+			kmodules+=("${m##/lib/modules/$KERNEL/}")
 		done < "$kmodules_list"
 
 		__trace_print $TRACE_KIND_RESOLVE_MODALIAS \