History

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.

John Stultz committed 14 years ago

Commit 320d41b1 parent c0c0cda1 file · +2 −2Browse files

Unified · Split

scripts/kconfig/merge_config.sh+2−2
@@ -104,8 +104,8 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET · 103 unmodified lines
104# Check all specified config values took (might have missed-dependency issues)104# Check all specified config values took (might have missed-dependency issues)
105for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do105for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
106 106
107 REQUESTED_VAL=$(sed -n "$SED_CONFIG_EXP" $TMP_FILE | grep -w -e "$CFG")107 REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
108 ACTUAL_VAL=$(sed -n "$SED_CONFIG_EXP" .config | grep -w -e "$CFG")108 ACTUAL_VAL=$(grep -w -e "$CFG" .config)
109 if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then109 if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
110 echo "Value requested for $CFG not in final .config"110 echo "Value requested for $CFG not in final .config"
111 echo "Requested value: $REQUESTED_VAL"111 echo "Requested value: $REQUESTED_VAL"