Commit 1073c15f authored by Mirsad Goran Todorovac's avatar Mirsad Goran Todorovac Committed by Masahiro Yamada
Browse files

scripts: merge_config: Fix typo in variable name. 



${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
syntax error in certain paths of the script execution.

Fixes: 46dff8d7 ("scripts: merge_config: Add option to suppress warning on overrides")
Signed-off-by: default avatarMirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 3ced71d2

scripts/kconfig/merge_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do 
		NEW_VAL=$(grep -w $CFG $MERGE_FILE)

		BUILTIN_FLAG=false

		if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then

			${WARNOVVERIDE} Previous  value: $PREV_VAL

			${WARNOVERRIDE} Previous  value: $PREV_VAL

			${WARNOVERRIDE} New value:       $NEW_VAL

			${WARNOVERRIDE} -y passed, will not demote y to m

			${WARNOVERRIDE}