From patchwork Fri Mar 13 06:21:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 6001991 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5459A9F380 for ; Fri, 13 Mar 2015 06:23:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CFD8202AE for ; Fri, 13 Mar 2015 06:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1E5E202B8 for ; Fri, 13 Mar 2015 06:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbbCMGW2 (ORCPT ); Fri, 13 Mar 2015 02:22:28 -0400 Received: from conuserg009.nifty.com ([202.248.44.35]:57775 "EHLO conuserg009-v.nifty.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751941AbbCMGW1 (ORCPT ); Fri, 13 Mar 2015 02:22:27 -0400 Received: from beagle.diag.org (KD036010032014.au-net.ne.jp [36.10.32.14]) (authenticated) by conuserg009-v.nifty.com with ESMTP id t2D6Ln9k018725; Fri, 13 Mar 2015 15:22:04 +0900 X-Nifty-SrcIP: [36.10.32.14] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Josh Boyer , Darren Hart , john stultz , Michal Marek , Josh Triplett , Masahiro Yamada , linux-kernel@vger.kernel.org, "Yann E. MORIN" Subject: [PATCH 5/6] merge_config.sh: rename MAKE to RUNMAKE Date: Fri, 13 Mar 2015 15:21:42 +0900 Message-Id: <1426227703-31815-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426227703-31815-1-git-send-email-yamada.masahiro@socionext.com> References: <1426227703-31815-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The variable "MAKE" is used to store the command name that has invoked the Makefile. (Actually, it is already set to "make" if you run this script from a Makefile.) In this script, however, it is used to determine if Make should be run or not. It is not what we usually expect. Signed-off-by: Masahiro Yamada --- 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 56584b1..ec8e203 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -35,7 +35,7 @@ usage() { echo " -O dir to put generated output files" } -MAKE=true +RUNMAKE=true ALLTARGET=alldefconfig WARNREDUN=false OUTPUT=. @@ -48,7 +48,7 @@ while true; do continue ;; "-m") - MAKE=false + RUNMAKE=false shift continue ;; @@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do cat $MERGE_FILE >> $TMP_FILE done -if [ "$MAKE" = "false" ]; then +if [ "$RUNMAKE" = "false" ]; then cp $TMP_FILE $OUTPUT/.config echo "#" echo "# merged configuration written to $OUTPUT/.config (needs make)"