aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/confdata.c
diff options
context:
space:
mode:
authorArnaud Lacombe <lacombar@gmail.com>2010-08-18 01:57:13 -0400
committerArnaud Lacombe <lacombar@gmail.com>2010-09-19 22:53:53 -0400
commit0954828fcbf3bd13d593499b16b901a4e801b0b9 (patch)
treec44e00f43b789c3fb5ab69c36d9ec408820dec21 /scripts/kconfig/confdata.c
parentc55c9d571a3db7a096834b6c8a58d5a32dc807e6 (diff)
kconfig: replace KERNELVERSION usage by the mainmenu's prompt
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/confdata.c')
-rw-r--r--scripts/kconfig/confdata.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 9f3c8899da5a..f7d89d7065b7 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -574,8 +574,6 @@ int conf_write(const char *name)
574 if (!out) 574 if (!out)
575 return 1; 575 return 1;
576 576
577 sym = sym_lookup("KERNELVERSION", 0);
578 sym_calc_value(sym);
579 time(&now); 577 time(&now);
580 env = getenv("KCONFIG_NOTIMESTAMP"); 578 env = getenv("KCONFIG_NOTIMESTAMP");
581 if (env && *env) 579 if (env && *env)
@@ -583,10 +581,10 @@ int conf_write(const char *name)
583 581
584 fprintf(out, _("#\n" 582 fprintf(out, _("#\n"
585 "# Automatically generated make config: don't edit\n" 583 "# Automatically generated make config: don't edit\n"
586 "# Linux kernel version: %s\n" 584 "# %s\n"
587 "%s%s" 585 "%s%s"
588 "#\n"), 586 "#\n"),
589 sym_get_string_value(sym), 587 rootmenu.prompt->text,
590 use_timestamp ? "# " : "", 588 use_timestamp ? "# " : "",
591 use_timestamp ? ctime(&now) : ""); 589 use_timestamp ? ctime(&now) : "");
592 590
@@ -797,25 +795,23 @@ int conf_write_autoconf(void)
797 return 1; 795 return 1;
798 } 796 }
799 797
800 sym = sym_lookup("KERNELVERSION", 0);
801 sym_calc_value(sym);
802 time(&now); 798 time(&now);
803 fprintf(out, "#\n" 799 fprintf(out, "#\n"
804 "# Automatically generated make config: don't edit\n" 800 "# Automatically generated make config: don't edit\n"
805 "# Linux kernel version: %s\n" 801 "# %s\n"
806 "# %s" 802 "# %s"
807 "#\n", 803 "#\n",
808 sym_get_string_value(sym), ctime(&now)); 804 rootmenu.prompt->text, ctime(&now));
809 fprintf(tristate, "#\n" 805 fprintf(tristate, "#\n"
810 "# Automatically generated - do not edit\n" 806 "# Automatically generated - do not edit\n"
811 "\n"); 807 "\n");
812 fprintf(out_h, "/*\n" 808 fprintf(out_h, "/*\n"
813 " * Automatically generated C config: don't edit\n" 809 " * Automatically generated C config: don't edit\n"
814 " * Linux kernel version: %s\n" 810 " * %s\n"
815 " * %s" 811 " * %s"
816 " */\n" 812 " */\n"
817 "#define AUTOCONF_INCLUDED\n", 813 "#define AUTOCONF_INCLUDED\n",
818 sym_get_string_value(sym), ctime(&now)); 814 rootmenu.prompt->text, ctime(&now));
819 815
820 for_all_symbols(i, sym) { 816 for_all_symbols(i, sym) {
821 sym_calc_value(sym); 817 sym_calc_value(sym);