Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624AbbHTNyi (ORCPT ); Thu, 20 Aug 2015 09:54:38 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:35353 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759AbbHTNyg (ORCPT ); Thu, 20 Aug 2015 09:54:36 -0400 From: Gabriel de Perthuis To: "Yann E . MORIN" Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Gabriel de Perthuis Subject: [PATCH] kconfig/merge_config.sh: Support KCONFIG_CONFIG Date: Thu, 20 Aug 2015 15:54:04 +0200 Message-Id: X-Mailer: git-send-email 2.5.0.347.g10df1da Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2018 Lines: 56 All make targets support $KCONFIG_CONFIG because they run scripts/kconf. Make sure this script accesses the right file in all cases. Previously this script broke in two different code paths, one for targets like kvmconfig (which use -m then call a target that respects KCONFIG_CONFIG) and one for direct use of the script without -m, which called make rules that edit KCONFIG_CONFIG but verified a different file. Signed-off-by: Gabriel de Perthuis --- scripts/kconfig/merge_config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index ec8e203..7b53f02 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -118,13 +118,13 @@ for MERGE_FILE in $MERGE_LIST ; do done cat $MERGE_FILE >> $TMP_FILE done if [ "$RUNMAKE" = "false" ]; then - cp $TMP_FILE $OUTPUT/.config + cp $TMP_FILE ${KCONFIG_CONFIG:=$OUTPUT/.config} echo "#" - echo "# merged configuration written to $OUTPUT/.config (needs make)" + echo "# merged configuration written to $KCONFIG_CONFIG (needs make)" echo "#" clean_up exit fi @@ -144,11 +144,11 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues) for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE) - ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config) + ACTUAL_VAL=$(grep -w -e "$CFG" ${KCONFIG_CONFIG:=$OUTPUT/.config}) if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then echo "Value requested for $CFG not in final .config" echo "Requested value: $REQUESTED_VAL" echo "Actual value: $ACTUAL_VAL" echo "" -- 2.5.0.347.g10df1da -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/