From patchwork Tue May 13 22:02:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexis Berlemont X-Patchwork-Id: 4171081 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A9949C0ACC for ; Tue, 13 May 2014 22:12:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE4A82024D for ; Tue, 13 May 2014 22:12:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD8FA2027D for ; Tue, 13 May 2014 22:12:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754174AbaEMWMR (ORCPT ); Tue, 13 May 2014 18:12:17 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:53836 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755148AbaEMWFO (ORCPT ); Tue, 13 May 2014 18:05:14 -0400 Received: by mail-wi0-f170.google.com with SMTP id bs8so7809884wib.3 for ; Tue, 13 May 2014 15:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1dtp/ufwAAmwi3BhjPqtLAzJe1liex8+MhjWbARbMPE=; b=LXiHsewrMvWuJ9vQcqoXzrkyXgJOAOsLfkPItmujUuvz15Q06+ZdqtNsDrGOabafCq cpjJdI3ZpAUQG3NTzIvZ7eYAIOko9U9Wm8f6gWm8s9R1LevQxeQuTq6eBBA6iOGosTJl czW+E+WfKKsV1KPDIpoAmjpUOQOUghFogX9TMZk9fN3M/g0ytv8cNvOpfvwbnnDFF0UR nFsnebvwM67f6r36ItLbGqn1XTikM6lVxfeFTxRji13OtDLDt40/BwiymOORH6ibtIxn sf3QQQx411miJUw3siVeNhV430d1FslgnuBAKzY3dq+2ezA7kQG1eai45OEHbKPocvhP /aZw== X-Received: by 10.194.243.3 with SMTP id wu3mr29234990wjc.29.1400018712930; Tue, 13 May 2014 15:05:12 -0700 (PDT) Received: from localhost.localdomain (APuteaux-554-1-77-61.w82-124.abo.wanadoo.fr. [82.124.220.61]) by mx.google.com with ESMTPSA id lj15sm335557wic.13.2014.05.13.15.05.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 May 2014 15:05:12 -0700 (PDT) From: Alexis Berlemont To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , acme@ghostprotocols.net, dsahern@gmail.com, mingo@kernel.org, Peter Zijlstra , Ingo Molnar , Paul Mackerras , Corey Ashford , Frederic Weisbecker , Namhyung Kim , Borislav Petkov , Michal Marek , linux-kbuild@vger.kernel.org, Stephane Eranian Subject: [PATCH 02/34] kbuild: Introduce KCONFIG_AUTOCONFIGDEP variable for conf tool Date: Wed, 14 May 2014 00:02:57 +0200 Message-Id: <1400018609-20486-3-git-send-email-alexis.berlemont@gmail.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400018609-20486-1-git-send-email-alexis.berlemont@gmail.com> References: <1400018609-20486-1-git-send-email-alexis.berlemont@gmail.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=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Jiri Olsa Introducing KCONFIG_AUTOCONFIGDEP variable for conf tool allowing to specify custom auto.conf.cmd file. Signed-off-by: Jiri Olsa Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Paul Mackerras Cc: Corey Ashford Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Borislav Petkov Cc: Michal Marek Cc: linux-kbuild@vger.kernel.org Cc: Stephane Eranian --- scripts/kconfig/confdata.c | 11 ++++++++++- scripts/kconfig/lkc.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index f88d90f..7afb2a7 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -75,6 +75,14 @@ const char *conf_get_autoconfig_name(void) return name ? name : "include/config/auto.conf"; } +const char *conf_get_autoconfigdep_name(void) +{ + char *name = getenv("KCONFIG_AUTOCONFIGDEP"); + + return name ? name : "include/config/auto.conf.cmd"; +} + + static char *conf_expand_value(const char *in) { struct symbol *sym; @@ -953,7 +961,8 @@ int conf_write_autoconf(void) sym_clear_all_valid(); - file_write_dep("include/config/auto.conf.cmd"); + name = conf_get_autoconfigdep_name(); + file_write_dep(name); if (conf_split_config()) return 1; diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index d5daa7a..ac99004 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -84,6 +84,7 @@ const char *zconf_curname(void); /* confdata.c */ const char *conf_get_configname(void); const char *conf_get_autoconfig_name(void); +const char *conf_get_autoconfigdep_name(void); char *conf_get_default_confname(void); void sym_set_change_count(int count); void sym_add_change_count(int count);