Skip to contentSkip to conversation

merge_config.sh: Fix bug in final check

PATCH New John Stultz 1 participant 1 message Dec 1, 2011 Kconfig

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 merge_config.sh: Fix bug in final check

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 <[email protected]>
CC Darren Hart <[email protected]>
CC Michal Marek <[email protected]>
CC Arnaud Lacombe <[email protected]>
---
 scripts/kconfig/merge_config.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
scripts/kconfig/merge_config.sh +2 -2
index 890276b..6f12fb3 100755
@@ -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"
Signature · 1 line
1.7.3.2.146.gca209