From patchwork Sat May 14 00:36:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kelly X-Patchwork-Id: 9094341 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 13FB29F1C3 for ; Sat, 14 May 2016 00:37:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B1DE2021A for ; Sat, 14 May 2016 00:37:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D10820218 for ; Sat, 14 May 2016 00:37:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751618AbcENAhE (ORCPT ); Fri, 13 May 2016 20:37:04 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33680 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbcENAhD (ORCPT ); Fri, 13 May 2016 20:37:03 -0400 Received: by mail-pa0-f53.google.com with SMTP id xk12so45846287pac.0 for ; Fri, 13 May 2016 17:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=surround.io; s=google; h=from:to:cc:subject:date:message-id; bh=lQMCfqZr+s2YR/o9fV8slJRgjts+ux9aQ9qyTPPS9GM=; b=OiV9Ua63AVW1DHTrvfNDcAzVlPU6sDGE1peP2ZaVINFE1yPJgRn9BXP2KbYFOUzxwa E/FqU4OnKVNMq6BpbIiK1eFJ3isDikXYaUFB1Ftjnt/N4n2rMzUP7poPM8nYV5Hcb0pm XCctqxAxB5HQAO7+CeUi35/FPAz99Xd7zaO/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lQMCfqZr+s2YR/o9fV8slJRgjts+ux9aQ9qyTPPS9GM=; b=LtbriJ4QlsmvuoJzXgJMybmWkozsdcTAZyHn2bkrgf0HGz5er/OqV4Jm7E4GUKJ7gA Pzr0Owhk6y08SGz897LuRq+ITBJfyza315m5gu5f6YzrNikzL3ZnhjOR79DAuuJesMTc dOLzysoRUIrjMXCGqyGxbBI+Wh+JIFUt9E2oBFcirw9KaM/auITTNBLA161iE5sbwqkT 95kaMEzNOF2h9dWzPmaAumUaU3rqEPawWoGKguQrjc1478T+T0AqUwZa2lUKlbTjIlle gp1sH6ARzt1jWlZKZ9gfyt3CL7wINM1jQWeCT14sC0Ir+UUdDYQt4j6gUOLksdZK1I5n odDg== X-Gm-Message-State: AOPr4FW0kVR9uvTM/IJS1dGYWQZ/VCvKhTktYsaBe1klVtZZqbxJkkhPgv5PHxXJKtrctdmu X-Received: by 10.66.221.167 with SMTP id qf7mr27290880pac.94.1463186221878; Fri, 13 May 2016 17:37:01 -0700 (PDT) Received: from columbia.surround.io ([96.93.106.70]) by smtp.gmail.com with ESMTPSA id 133sm30082178pfw.35.2016.05.13.17.37.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 17:37:01 -0700 (PDT) From: Martin Kelly To: linux-kbuild@vger.kernel.org, yann.morin.1998@free.fr Cc: linux-kernel@vger.kernel.org, Martin Kelly Subject: [PATCH] kconfig/merge_config.sh: add -C to choose make dir Date: Fri, 13 May 2016 17:36:20 -0700 Message-Id: <1463186180-31967-1-git-send-email-martin@surround.io> X-Mailer: git-send-email 2.1.4 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This is useful for running the script from somewhere besides the root of the source tree. Signed-off-by: Martin Kelly --- scripts/kconfig/merge_config.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 67d1314..36b545d 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -32,6 +32,7 @@ usage() { echo " -m only merge the fragments, do not execute the make command" echo " -n use allnoconfig instead of alldefconfig" echo " -r list redundant entries when merging fragments" + echo " -C dir in which to run make" echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead." } @@ -61,6 +62,16 @@ while true; do shift continue ;; + "-C") + if [ -d $2 ];then + MAKEDIR=$(echo $2 | sed 's/\/*$//') + else + echo "make directory $2 does not exist" 1>&2 + exit 1 + fi + shift 2 + continue + ;; "-O") if [ -d $2 ];then OUTPUT=$(echo $2 | sed 's/\/*$//') @@ -151,7 +162,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 KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET +make -C "$MAKEDIR" KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues)