Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764120Ab3DDTDR (ORCPT ); Thu, 4 Apr 2013 15:03:17 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:54488 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763581Ab3DDTDQ (ORCPT ); Thu, 4 Apr 2013 15:03:16 -0400 From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Zhangfei Gao , Viresh Kumar , Michal Marek , Bruce Ashfield , Darren Hart Subject: [PATCH] merge_config.sh: Avoid creating unnessary source softlinks Date: Thu, 4 Apr 2013 12:02:59 -0700 Message-Id: <1365102179-19176-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2028 Lines: 55 Viresh noticed when using merge_config.sh that a source softlink was being created even when he didn't specify the -O option. The problem arises due to the previous commit 409f117e2d6b which added the -O option. Basically if -O is not specified, we still pass '-O=.' to the make command, which then generates a source softlink to ./ This patch adds an extra check so if there is no -O specified to merge_config.sh, we don't pass one on to make. Cc: Zhangfei Gao Cc: Viresh Kumar Cc: Michal Marek Cc: Bruce Ashfield Cc: Darren Hart Reported-by: Viresh Kumar Tested-by: Viresh Kumar Signed-off-by: John Stultz --- scripts/kconfig/merge_config.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 05274fc..81b0c61 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then exit fi +# If we have an output dir, setup the O= argument, otherwise leave +# it blank, since O=. will create an unnecessary ./source softlink +OUTPUT_ARG="" +if [ "$OUTPUT" != "." ] ; then + OUTPUT_ARG="O=$OUTPUT" +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 O=$OUTPUT $ALLTARGET +make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues) -- 1.7.10.4 -- 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/