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