1commit 28fac3973b3c693c453594b007c08c1e1e5c4af3
2Author: Ilya Kuzmich <ilya.kuzmich@gmail.com>
3Date: Tue, 9 Jan 2018 14:37:43 +0300
4
5    merge_config.sh: add br2-external support
6
7    Pass BR2_EXTERNAL value via -e option.
8    This will prevent merge_config.sh from silently eating any symbols defined in
9    external trees on a clean buildroot tree invocation.
10
11    Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
12    Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
13    Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
14
15Index: kconfig/merge_config.sh
16===================================================================
17--- kconfig.orig/merge_config.sh
18+++ kconfig/merge_config.sh
19@@ -33,6 +33,7 @@ usage() {
20 	echo "  -n    use allnoconfig instead of alldefconfig"
21 	echo "  -r    list redundant entries when merging fragments"
22 	echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
23+	echo "  -e    colon-separated list of br2-external trees to use (optional)"
24 }
25
26 RUNMAKE=true
27@@ -71,6 +72,11 @@ while true; do
28 		shift 2
29 		continue
30 		;;
31+	"-e")
32+		EXTERNAL_ARG="BR2_EXTERNAL=$2"
33+		shift 2
34+		continue
35+		;;
36 	*)
37 		break
38 		;;
39@@ -151,7 +157,7 @@ fi
40 # Use the merged file as the starting point for:
41 # alldefconfig: Fills in any missing symbols with Kconfig default
42 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
43-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
44+make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
45
46
47 # Check all specified config values took (might have missed-dependency issues)
48