From patchwork Mon Apr 1 19:18:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 2372351 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E591F3FD40 for ; Mon, 1 Apr 2013 19:22:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759527Ab3DATWv (ORCPT ); Mon, 1 Apr 2013 15:22:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45033 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759370Ab3DATVg (ORCPT ); Mon, 1 Apr 2013 15:21:36 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r31JKTAA012982 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Apr 2013 15:20:29 -0400 Received: from krava.redhat.com (vpn1-5-165.ams2.redhat.com [10.36.5.165]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r31JIp9w022005; Mon, 1 Apr 2013 15:20:24 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , 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 24/27] kbuild: Introduce KCONFIG_AUTOCONFIGDEP variable for conf tool Date: Mon, 1 Apr 2013 21:18:47 +0200 Message-Id: <1364843930-17974-25-git-send-email-jolsa@redhat.com> In-Reply-To: <1364843930-17974-1-git-send-email-jolsa@redhat.com> References: <1364843930-17974-1-git-send-email-jolsa@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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 13ddf11..435c361 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; @@ -948,7 +956,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 f8aee5f..5e370b1 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -83,6 +83,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);