From patchwork Thu Apr 4 19:02:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 15937 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 388FB277E2 for ; Thu, 4 Apr 2013 19:03:25 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 1sf485271qee.11 for ; Thu, 04 Apr 2013 12:03:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=/GUHE20j/7P1uy8fEekDvZ4Gvg3FxrYPM9U4ZEmdltA=; b=mf8JNxhDOep2i8eRsctAzvLixjKJf+CwONYX/dVF2Vw0XZSOpx9WsUE7kj9cvALYmL aaoGD5D+pN8c8TihclZVqo6YeMEe8i3kinrNA2E9Y7P/yRd7BuwGMl/AhZBQq6XEySVp Hdw8UNk160FJhwpSn3ioyU93lnjtwzOWnjTR1xYk9PuYHOYrOMF7C7ZAjJL7aMlblk2j RbdqK8KLPXpJ2aW9Ho/Pik0ly8NG+EpftMkE6XuUogzA1ZyO8Q99NYSON53O5/OvBmNV L5Yu1b9L3uSwIHLVL6nOdkz+23s4117XI8u9Pw69hLhyqObmQUq4C3D6VitKynng0TZx DDCA== X-Received: by 10.236.154.6 with SMTP id g6mr3329151yhk.28.1365102198451; Thu, 04 Apr 2013 12:03:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.113 with SMTP id c17ls1684575qen.0.gmail; Thu, 04 Apr 2013 12:03:18 -0700 (PDT) X-Received: by 10.220.109.145 with SMTP id j17mr5752738vcp.34.1365102198189; Thu, 04 Apr 2013 12:03:18 -0700 (PDT) Received: from mail-vb0-x22b.google.com (mail-vb0-x22b.google.com [2607:f8b0:400c:c02::22b]) by mx.google.com with ESMTPS id b4si8998633vdw.31.2013.04.04.12.03.18 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:03:18 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22b is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22b; Received: by mail-vb0-f43.google.com with SMTP id q12so1552015vbe.2 for ; Thu, 04 Apr 2013 12:03:17 -0700 (PDT) X-Received: by 10.220.77.138 with SMTP id g10mr332865vck.69.1365102197796; Thu, 04 Apr 2013 12:03:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.85.136 with SMTP id h8csp228613vez; Thu, 4 Apr 2013 12:03:17 -0700 (PDT) X-Received: by 10.67.1.8 with SMTP id bc8mr11174744pad.96.1365102196545; Thu, 04 Apr 2013 12:03:16 -0700 (PDT) Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by mx.google.com with ESMTPS id gk5si6984738pbb.112.2013.04.04.12.03.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:03:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.175 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.192.175; Received: by mail-pd0-f175.google.com with SMTP id g10so1361519pdj.6 for ; Thu, 04 Apr 2013 12:03:15 -0700 (PDT) X-Received: by 10.68.14.165 with SMTP id q5mr10286253pbc.125.1365102195636; Thu, 04 Apr 2013 12:03:15 -0700 (PDT) Received: from localhost.localdomain (c-24-21-54-107.hsd1.or.comcast.net. [24.21.54.107]) by mx.google.com with ESMTPS id pg7sm11217722pbc.5.2013.04.04.12.03.13 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:03:14 -0700 (PDT) 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 X-Gm-Message-State: ALoCoQlD4g+ZKPAxYIv69p/ssDVuFd5tVs/pbWz4kWOHh9HxQNZ3tC88Sn3zn4eo8BZigu/yigsd X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22b is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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)