1Index: kconfig/merge_config.sh
2===================================================================
3--- kconfig.orig/merge_config.sh
4+++ kconfig/merge_config.sh
5@@ -109,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
6 fi
7
8 MERGE_LIST=$*
9-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
10+SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
11+SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
12
13 TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
14
15@@ -123,7 +124,7 @@ for MERGE_FILE in $MERGE_LIST ; do
16 		echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
17 		exit 1
18 	fi
19-	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
20+	CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
21
22 	for CFG in $CFG_LIST ; do
23 		grep -q -w $CFG $TMP_FILE || continue
24@@ -166,7 +167,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERN
25
26
27 # Check all specified config values took (might have missed-dependency issues)
28-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
29+for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
30
31 	REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
32 	ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
33