Unverified Commit 3b4a3a00 authored by Weizhao Ouyang's avatar Weizhao Ouyang Committed by Nathan Chancellor
Browse files

scripts: kconfig: merge_config.sh: fix unexpected operator warning 



Fix a warning for:

$ ./scripts/kconfig/merge_config.sh .config extra.config
Using .config as base
Merging extra.config
./scripts/kconfig/merge_config.sh: 384: [: false: unexpected operator

The shellcheck report is also attached:

if [ "$STRICT" == "true" ] && [ "$STRICT_MODE_VIOLATED" == "true" ]; then
               ^-- SC3014 (warning): In POSIX sh, == in place of = is undefined.
                                                        ^-- SC3014 (warning): In POSIX sh, == in place of = is undefined.

Fixes: dfc97e1c ("scripts: kconfig: merge_config.sh: use awk in checks too")
Signed-off-by: default avatarWeizhao Ouyang <o451686892@gmail.com>
Reviewed-by: default avatarMikko Rapeli <mikko.rapeli@linaro.org>
Link: https://patch.msgid.link/20260309121505.40454-1-o451686892@gmail.com


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
parent a76e30c2

scripts/kconfig/merge_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,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