| Message ID | 1364843930-17974-25-git-send-email-jolsa@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 1.4.2013 21:18, Jiri Olsa wrote: > Introducing KCONFIG_AUTOCONFIGDEP variable for conf tool > allowing to specify custom auto.conf.cmd file. I suggest to just append .cmd to the auto.conf name, instead of introducing a new environment variable. (I haven't looked at the rest of the patches yet). Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
Introducing KCONFIG_AUTOCONFIGDEP variable for conf tool allowing to specify custom auto.conf.cmd file. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Michal Marek <mmarek@suse.cz> Cc: linux-kbuild@vger.kernel.org Cc: Stephane Eranian <eranian@google.com> --- scripts/kconfig/confdata.c | 11 ++++++++++- scripts/kconfig/lkc.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-)