kconfig/merge_config.sh: add -C to choose make dir
diff mbox

Message ID 1463186180-31967-1-git-send-email-martin@surround.io
State New
Headers show

Commit Message

Martin Kelly May 14, 2016, 12:36 a.m. UTC
This is useful for running the script from somewhere besides the root of
the source tree.

Signed-off-by: Martin Kelly <martin@surround.io>
---
 scripts/kconfig/merge_config.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Patch
diff mbox

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 67d1314..36b545d 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -32,6 +32,7 @@  usage() {
 	echo "  -m    only merge the fragments, do not execute the make command"
 	echo "  -n    use allnoconfig instead of alldefconfig"
 	echo "  -r    list redundant entries when merging fragments"
+	echo "  -C    dir in which to run make"
 	echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
 }
 
@@ -61,6 +62,16 @@  while true; do
 		shift
 		continue
 		;;
+	"-C")
+		if [ -d $2 ];then
+			MAKEDIR=$(echo $2 | sed 's/\/*$//')
+		else
+			echo "make directory $2 does not exist" 1>&2
+			exit 1
+		fi
+		shift 2
+		continue
+		;;
 	"-O")
 		if [ -d $2 ];then
 			OUTPUT=$(echo $2 | sed 's/\/*$//')
@@ -151,7 +162,7 @@  fi
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
+make -C "$MAKEDIR" KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)