tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds bbeb83d3 24f9515d

+11 -15
+1 -1
Makefile
··· 1654 1654 modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \ 1655 1655 compile_commands.json rust/test \ 1656 1656 rust-project.json .vmlinux.objs .vmlinux.export.c \ 1657 - .builtin-dtbs-list .builtin-dtb.S 1657 + .builtin-dtbs-list .builtin-dtbs.S 1658 1658 1659 1659 # Directories & files removed with 'make mrproper' 1660 1660 MRPROPER_FILES += include/config include/generated \
+10 -14
scripts/kconfig/merge_config.sh
··· 151 151 if ! "$AWK" -v prefix="$CONFIG_PREFIX" \ 152 152 -v warnoverride="$WARNOVERRIDE" \ 153 153 -v strict="$STRICT" \ 154 + -v outfile="$TMP_FILE.new" \ 154 155 -v builtin="$BUILTIN" \ 155 156 -v warnredun="$WARNREDUN" ' 156 157 BEGIN { ··· 196 195 197 196 # First pass: read merge file, store all lines and index 198 197 FILENAME == ARGV[1] { 199 - mergefile = FILENAME 198 + mergefile = FILENAME 200 199 merge_lines[FNR] = $0 201 200 merge_total = FNR 202 201 cfg = get_cfg($0) ··· 213 212 214 213 # Not a config or not in merge file - keep it 215 214 if (cfg == "" || !(cfg in merge_cfg)) { 216 - print $0 >> ARGV[3] 215 + print $0 >> outfile 217 216 next 218 217 } 219 218 220 - prev_val = $0 219 + prev_val = $0 221 220 new_val = merge_cfg[cfg] 222 221 223 222 # BUILTIN: do not demote y to m 224 223 if (builtin == "true" && new_val ~ /=m$/ && prev_val ~ /=y$/) { 225 224 warn_builtin(cfg, prev_val, new_val) 226 - print $0 >> ARGV[3] 225 + print $0 >> outfile 227 226 skip_merge[merge_cfg_line[cfg]] = 1 228 227 next 229 228 } ··· 236 235 237 236 # "=n" is the same as "is not set" 238 237 if (prev_val ~ /=n$/ && new_val ~ / is not set$/) { 239 - print $0 >> ARGV[3] 238 + print $0 >> outfile 240 239 next 241 240 } 242 241 ··· 247 246 } 248 247 } 249 248 250 - # output file, skip all lines 251 - FILENAME == ARGV[3] { 252 - nextfile 253 - } 254 - 255 249 END { 256 250 # Newline in case base file lacks trailing newline 257 - print "" >> ARGV[3] 251 + print "" >> outfile 258 252 # Append merge file, skipping lines marked for builtin preservation 259 253 for (i = 1; i <= merge_total; i++) { 260 254 if (!(i in skip_merge)) { 261 - print merge_lines[i] >> ARGV[3] 255 + print merge_lines[i] >> outfile 262 256 } 263 257 } 264 258 if (strict_violated) { 265 259 exit 1 266 260 } 267 261 }' \ 268 - "$ORIG_MERGE_FILE" "$TMP_FILE" "$TMP_FILE.new"; then 262 + "$ORIG_MERGE_FILE" "$TMP_FILE"; then 269 263 # awk exited non-zero, strict mode was violated 270 264 STRICT_MODE_VIOLATED=true 271 265 fi ··· 377 381 STRICT_MODE_VIOLATED=true 378 382 fi 379 383 380 - if [ "$STRICT" == "true" ] && [ "$STRICT_MODE_VIOLATED" == "true" ]; then 384 + if [ "$STRICT" = "true" ] && [ "$STRICT_MODE_VIOLATED" = "true" ]; then 381 385 echo "Requested and effective config differ" 382 386 exit 1 383 387 fi