Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b0f7507 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scripts: gki: Add proper MAKE PATH"

parents 86fc732f 1e0439c3

scripts/gki/generate_defconfig.sh

+3 −2
Original line number Diff line number Diff line 
#!/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

scripts/kconfig/merge_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -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)