Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 320d41bb authored by John Stultz's avatar John Stultz Committed by Michal Marek
Browse files

merge_config.sh: fix bug in final check 



Arnaud Lacombe pointed out the final checking that the requested configs
were included in the final .config was broken.

The example was that if you had a fragment that disabled
CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no
final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final
.config.

This bug was introduced by me in v3 of the original patch, and the
following patch reverts the invalid change.

Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Reported-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent c0c0cda2

scripts/kconfig/merge_config.sh

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET 
# Check all specified config values took (might have missed-dependency issues)

for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do



	REQUESTED_VAL=$(sed -n "$SED_CONFIG_EXP" $TMP_FILE | grep -w -e "$CFG")

	ACTUAL_VAL=$(sed -n "$SED_CONFIG_EXP" .config | grep -w -e "$CFG")

	REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)

	ACTUAL_VAL=$(grep -w -e "$CFG" .config)

	if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then

		echo "Value requested for $CFG not in final .config"

		echo "Requested value:  $REQUESTED_VAL"