diff mbox

merge_config.sh: Fix bug in final check

Message ID 1322769053-25038-1-git-send-email-john.stultz@linaro.org
State Accepted
Commit 320d41bb1597799669bab28a047f9868dd754aca
Headers show

Commit Message

John Stultz Dec. 1, 2011, 7:50 p.m. UTC 
Hey Andrew,

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.

CC: Andrew Morton <akpm@linux-foundation.org>
CC: Darren Hart <dvhart@linux.intel.com>
CC: Michal Marek <mmarek@suse.cz>
CC: Arnaud Lacombe <lacombar@gmail.com>
Reported-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 scripts/kconfig/merge_config.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 890276b..6f12fb3 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -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"