From 1e0439c35e1330b7546dd20a40b3027a00425a1b Mon Sep 17 00:00:00 2001 From: Prakruthi Deepak Heragu Date: Fri, 14 Feb 2020 12:23:48 -0800 Subject: [PATCH] scripts: gki: Add proper MAKE PATH Add the prebuilt make path to be used in all script invocations. Change-Id: I173b5d404b31d70e0f26bc975cbeaaa66ed2f82f Signed-off-by: Prakruthi Deepak Heragu --- scripts/gki/generate_defconfig.sh | 5 +++-- scripts/kconfig/merge_config.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/gki/generate_defconfig.sh b/scripts/gki/generate_defconfig.sh index 2d71a37374b7..b6ab442fbe07 100755 --- a/scripts/gki/generate_defconfig.sh +++ b/scripts/gki/generate_defconfig.sh @@ -1,6 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-only -# Copyright (c) 2019, The Linux Foundation. All rights reserved. +# Copyright (c) 2020, The Linux Foundation. All rights reserved. # Script to generate a defconfig variant based on the input @@ -70,8 +70,9 @@ FINAL_DEFCONFIG_BLEND=`echo "${FINAL_DEFCONFIG_BLEND}" | awk '{ for (i=NF; i>1; echo "defconfig blend for $REQUIRED_DEFCONFIG: $FINAL_DEFCONFIG_BLEND" MAKE_ARGS=$KERN_MAKE_ARGS \ +MAKE_PATH=${MAKE_PATH} \ ${KERN_SRC}/scripts/kconfig/merge_config.sh $FINAL_DEFCONFIG_BLEND -make $KERN_MAKE_ARGS savedefconfig +${MAKE_PATH}make $KERN_MAKE_ARGS savedefconfig mv defconfig $CONFIGS_DIR/$REQUIRED_DEFCONFIG # Cleanup the allyes config fragment and other generated files diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index c17f39f507ce..e46c96b34d0d 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -172,7 +172,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 $MAKE_ARGS KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET +${MAKE_PATH}make $MAKE_ARGS KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues)