Commit 0954828f authored by Arnaud Lacombe's avatar Arnaud Lacombe
Browse files

kconfig: replace KERNELVERSION usage by the mainmenu's prompt 



Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarMichal Marek <mmarek@suse.cz>
parent c55c9d57

scripts/kconfig/confdata.c

+6 −10
Original line number Diff line number Diff line
@@ -574,8 +574,6 @@ int conf_write(const char *name) 
	if (!out)

		return 1;



	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	time(&now);

	env = getenv("KCONFIG_NOTIMESTAMP");

	if (env && *env)
@@ -583,10 +581,10 @@ int conf_write(const char *name) 


	fprintf(out, _("#\n"

		       "# Automatically generated make config: don't edit\n"

		       "# Linux kernel version: %s\n"

		       "# %s\n"

		       "%s%s"

		       "#\n"),

		     sym_get_string_value(sym),

		     rootmenu.prompt->text,

		     use_timestamp ? "# " : "",

		     use_timestamp ? ctime(&now) : "");
@@ -797,25 +795,23 @@ int conf_write_autoconf(void) 
		return 1;

	}



	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	time(&now);

	fprintf(out, "#\n"

		     "# Automatically generated make config: don't edit\n"

		     "# Linux kernel version: %s\n"

		     "# %s\n"

		     "# %s"

		     "#\n",

		     sym_get_string_value(sym), ctime(&now));

		     rootmenu.prompt->text, ctime(&now));

	fprintf(tristate, "#\n"

			  "# Automatically generated - do not edit\n"

			  "\n");

	fprintf(out_h, "/*\n"

		       " * Automatically generated C config: don't edit\n"

		       " * Linux kernel version: %s\n"

		       " * %s\n"

		       " * %s"

		       " */\n"

		       "#define AUTOCONF_INCLUDED\n",

		       sym_get_string_value(sym), ctime(&now));

		       rootmenu.prompt->text, ctime(&now));



	for_all_symbols(i, sym) {

		sym_calc_value(sym);

scripts/kconfig/gconf.c

+1 −4
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ void init_main_window(const gchar * glade_file) 
	GladeXML *xml;

	GtkWidget *widget;

	GtkTextBuffer *txtbuf;

	char title[256];

	GtkStyle *style;



	xml = glade_xml_new(glade_file, "window1", NULL);
@@ -210,9 +209,7 @@ void init_main_window(const gchar * glade_file) 
					  /*"style", PANGO_STYLE_OBLIQUE, */

					  NULL);



	sprintf(title, _("Linux Kernel v%s Configuration"),

		getenv("KERNELVERSION"));

	gtk_window_set_title(GTK_WINDOW(main_wnd), title);

	gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text);



	gtk_widget_show(main_wnd);

}

scripts/kconfig/mconf.c

+1 −5
Original line number Diff line number Diff line
@@ -288,13 +288,9 @@ static void set_config_filename(const char *config_filename) 
{

	static char menu_backtitle[PATH_MAX+128];

	int size;

	struct symbol *sym;



	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	size = snprintf(menu_backtitle, sizeof(menu_backtitle),

	                _("%s - Linux Kernel v%s Configuration"),

		        config_filename, sym_get_string_value(sym));

	                "%s - %s", config_filename, rootmenu.prompt->text);

	if (size >= sizeof(menu_backtitle))

		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';

	set_dialog_backtitle(menu_backtitle);

scripts/kconfig/nconf.c

+1 −5
Original line number Diff line number Diff line
@@ -633,13 +633,9 @@ static char menu_backtitle[PATH_MAX+128]; 
static const char *set_config_filename(const char *config_filename)

{

	int size;

	struct symbol *sym;



	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	size = snprintf(menu_backtitle, sizeof(menu_backtitle),

			_("%s - Linux Kernel v%s Configuration"),

			config_filename, sym_get_string_value(sym));

			"%s - %s", config_filename, rootmenu.prompt->text);

	if (size >= sizeof(menu_backtitle))

		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';

scripts/kconfig/qconf.cc

+2 −2
Original line number Diff line number Diff line
@@ -1274,8 +1274,8 @@ ConfigMainWindow::ConfigMainWindow(void) 
	char title[256];



	QDesktopWidget *d = configApp->desktop();

	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration%s"),

		getenv("KERNELVERSION"),

	snprintf(title, sizeof(title), "%s%s",

		rootmenu.prompt->text,

#if QT_VERSION < 0x040000

		" (Qt3)"

#else