Commit bbeb83d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux 

Pull Kbuild fixes from Nathan Chancellor:
 "This mostly addresses some issues with the awk conversion in
  scripts/kconfig/merge_config.sh.

   - Fix typo to ensure .builtin-dtbs.S is properly cleaned

   - Fix '==' bashism in scripts/kconfig/merge_config.sh

   - Fix awk error in scripts/kconfig/merge_config.sh when base
     configuration is empty

   - Fix inconsistent indentation in scripts/kconfig/merge_config.sh"

* tag 'kbuild-fixes-7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  scripts: kconfig: merge_config.sh: fix indentation
  scripts: kconfig: merge_config.sh: pass output file as awk variable
  scripts: kconfig: merge_config.sh: fix unexpected operator warning
  kbuild: Delete .builtin-dtbs.S when running make clean
parents 24f9515d 775af5cb

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1654,7 +1654,7 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \ 
	       modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \

	       compile_commands.json rust/test \

	       rust-project.json .vmlinux.objs .vmlinux.export.c \

               .builtin-dtbs-list .builtin-dtb.S

               .builtin-dtbs-list .builtin-dtbs.S



# Directories & files removed with 'make mrproper'

MRPROPER_FILES += include/config include/generated          \

scripts/kconfig/merge_config.sh

+10 −14
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 
	if ! "$AWK" -v prefix="$CONFIG_PREFIX" \

		-v warnoverride="$WARNOVERRIDE" \

		-v strict="$STRICT" \

		-v outfile="$TMP_FILE.new" \

		-v builtin="$BUILTIN" \

		-v warnredun="$WARNREDUN" '

	BEGIN {
@@ -212,7 +213,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 


		# Not a config or not in merge file - keep it

		if (cfg == "" || !(cfg in merge_cfg)) {

			print $0 >> ARGV[3]

			print $0 >> outfile

			next

		}
@@ -222,7 +223,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 
		# BUILTIN: do not demote y to m

		if (builtin == "true" && new_val ~ /=m$/ && prev_val ~ /=y$/) {

			warn_builtin(cfg, prev_val, new_val)

			print $0 >> ARGV[3]

			print $0 >> outfile

			skip_merge[merge_cfg_line[cfg]] = 1

			next

		}
@@ -235,7 +236,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 


		# "=n" is the same as "is not set"

		if (prev_val ~ /=n$/ && new_val ~ / is not set$/) {

			print $0 >> ARGV[3]

			print $0 >> outfile

			next

		}
@@ -246,25 +247,20 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 
		}

	}



	# output file, skip all lines

	FILENAME == ARGV[3] {

		nextfile

	}



	END {

		# Newline in case base file lacks trailing newline

		print "" >> ARGV[3]

		print "" >> outfile

		# Append merge file, skipping lines marked for builtin preservation

		for (i = 1; i <= merge_total; i++) {

			if (!(i in skip_merge)) {

				print merge_lines[i] >> ARGV[3]

				print merge_lines[i] >> outfile

			}

		}

		if (strict_violated) {

			exit 1

		}

	}' \

	"$ORIG_MERGE_FILE" "$TMP_FILE" "$TMP_FILE.new"; then

	"$ORIG_MERGE_FILE" "$TMP_FILE"; then

		# awk exited non-zero, strict mode was violated

		STRICT_MODE_VIOLATED=true

	fi
@@ -381,7 +377,7 @@ END { 
	STRICT_MODE_VIOLATED=true

fi



if [ "$STRICT" == "true" ] && [ "$STRICT_MODE_VIOLATED" == "true" ]; then

if [ "$STRICT" = "true" ] && [ "$STRICT_MODE_VIOLATED" = "true" ]; then

	echo "Requested and effective config differ"

	exit 1

fi