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