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.

scripts: kconfig: merge_config.sh: warn on duplicate input files

External scripts like yocto kernel scc may provide
same input config fragment multiple times. This may
be a bug since processing same fragments multiple times
can be time consuming.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Link: https://patch.msgid.link/20260122105751.2186609-3-mikko.rapeli@linaro.org
Signed-off-by: Nathan Chancellor <nathan@kernel.org>

authored by

Mikko Rapeli and committed by
Nathan Chancellor a5b46cd1 dfc97e1c

+11
+11
scripts/kconfig/merge_config.sh
··· 130 130 131 131 cat $INITFILE > $TMP_FILE 132 132 133 + PROCESSED_FILES="" 134 + 133 135 # Merge files, printing warnings on overridden values 134 136 for ORIG_MERGE_FILE in $MERGE_LIST ; do 135 137 echo "Merging $ORIG_MERGE_FILE" ··· 139 137 echo "The merge file '$ORIG_MERGE_FILE' does not exist. Exit." >&2 140 138 exit 1 141 139 fi 140 + 141 + # Check for duplicate input files 142 + case " $PROCESSED_FILES " in 143 + *" $ORIG_MERGE_FILE "*) 144 + ${WARNOVERRIDE} "WARNING: Input file provided multiple times: $ORIG_MERGE_FILE" 145 + ;; 146 + esac 147 + 142 148 # Use awk for single-pass processing instead of per-symbol grep/sed 143 149 if ! "$AWK" -v prefix="$CONFIG_PREFIX" \ 144 150 -v warnoverride="$WARNOVERRIDE" \ ··· 269 259 STRICT_MODE_VIOLATED=true 270 260 fi 271 261 mv "$TMP_FILE.new" "$TMP_FILE" 262 + PROCESSED_FILES="$PROCESSED_FILES $ORIG_MERGE_FILE" 272 263 done 273 264 if [ "$STRICT_MODE_VIOLATED" = "true" ]; then 274 265 echo "The fragment redefined a value and strict mode had been passed."