[patches.git] / linux-kconfig-project-customize.patch

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 1199baf..a5f5102 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -557,8 +557,8 @@ int main(int ac, char **av)
 	case ask_silent:
 		if (stat(".config", &tmpstat)) {
 			printf(_("***\n"
-				"*** You have not yet configured your kernel!\n"
-				"*** (missing kernel .config file)\n"
+				"*** You have not yet configured your " PROJECT_INFORMAL "!\n"
+				"*** (missing " PROJECT_INFORMAL " .config file)\n"
 				"***\n"
 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
 				"*** \"make menuconfig\" or \"make xconfig\").\n"
@@ -604,7 +604,7 @@ int main(int ac, char **av)
 	} else if (conf_get_changed()) {
 		name = getenv("KCONFIG_NOSILENTUPDATE");
 		if (name && *name) {
-			fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
+			fprintf(stderr, _("\n*** " PROJECT " configuration requires explicit update.\n\n"));
 			return 1;
 		}
 	} else
@@ -615,12 +615,12 @@ int main(int ac, char **av)
 		check_conf(&rootmenu);
 	} while (conf_cnt);
 	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
 		return 1;
 	}
 skip_check:
 	if (input_mode == ask_silent && conf_write_autoconf()) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
 		return 1;
 	}
 
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 664fe29..06366ed 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -416,7 +416,7 @@ int conf_write(const char *name)
 	if (!out)
 		return 1;
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	time(&now);
 	env = getenv("KCONFIG_NOTIMESTAMP");
@@ -425,7 +425,7 @@ int conf_write(const char *name)
 
 	fprintf(out, _("#\n"
 		       "# Automatically generated make config: don't edit\n"
-		       "# Linux kernel version: %s\n"
+		       "# " PROJECT " version: %s\n"
 		       "%s%s"
 		       "#\n"),
 		     sym_get_string_value(sym),
@@ -672,21 +672,21 @@ int conf_write_autoconf(void)
 		return 1;
 	}
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	time(&now);
 	fprintf(out, "#\n"
 		     "# Automatically generated make config: don't edit\n"
-		     "# Linux kernel version: %s\n"
+		     "# " PROJECT " version: %s\n"
 		     "# %s"
 		     "#\n",
 		     sym_get_string_value(sym), ctime(&now));
 	fprintf(out_h, "/*\n"
 		       " * Automatically generated C config: don't edit\n"
-		       " * Linux kernel version: %s\n"
+		       " * " PROJECT " version: %s\n"
 		       " * %s"
 		       " */\n"
-		       "#define AUTOCONF_INCLUDED\n",
+		       "#define " AUTOCONF_DEFINE "\n",
 		       sym_get_string_value(sym), ctime(&now));
 
 	for_all_symbols(i, sym) {
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 61d8166..ba62d64 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -271,8 +271,8 @@ void init_main_window(const gchar * glade_file)
 					  /*"style", PANGO_STYLE_OBLIQUE, */
 					  NULL);
 
-	sprintf(title, _("Linux Kernel v%s Configuration"),
-		getenv("KERNELVERSION"));
+	sprintf(title, _(PROJECT " v%s Configuration"),
+		getenv(VERSION_SYMBOL));
 	gtk_window_set_title(GTK_WINDOW(main_wnd), title);
 
 	gtk_widget_show(main_wnd);
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 8a07ee4..e694cda 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -6,6 +6,8 @@
 #ifndef LKC_H
 #define LKC_H
 
+#include "lkc_local.h"
+
 #include "expr.h"
 
 #ifndef KBUILD_NO_NLS
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d0e4fa5..344f777 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -400,10 +400,10 @@ static void set_config_filename(const char *config_filename)
 	int size;
 	struct symbol *sym;
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym_calc_value(sym);
 	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-	                _("%s - Linux Kernel v%s Configuration"),
+	                _("%s - " PROJECT " v%s Configuration"),
 		        config_filename, sym_get_string_value(sym));
 	if (size >= sizeof(menu_backtitle))
 		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
@@ -931,8 +931,8 @@ int main(int ac, char **av)
 		}
 	case -1:
 		printf(_("\n\n"
-			"*** End of Linux kernel configuration.\n"
-			"*** Execute 'make' to build the kernel or try 'make help'."
+			"*** End of " PROJECT " configuration.\n"
+			"*** Execute 'make' to build the " PROJECT_INFORMAL " or try 'make help'."
 			"\n\n"));
 		break;
 	default:
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index c35dcc5..004b7df 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -61,10 +61,10 @@ void sym_init(void)
 	if (p)
 		sym_add_default(sym, p);
 
-	sym = sym_lookup("KERNELVERSION", 0);
+	sym = sym_lookup(VERSION_SYMBOL, 0);
 	sym->type = S_STRING;
 	sym->flags |= SYMBOL_AUTO;
-	p = getenv("KERNELVERSION");
+	p = getenv(VERSION_SYMBOL);
 	if (p)
 		sym_add_default(sym, p);
Commit	Line	Data
5e993f12	1	diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
	2	index 1199baf..a5f5102 100644
	3	--- a/scripts/kconfig/conf.c
	4	+++ b/scripts/kconfig/conf.c
	5	@@ -557,8 +557,8 @@ int main(int ac, char **av)
	6	case ask_silent:
	7	if (stat(".config", &tmpstat)) {
	8	printf(_("***\n"
	9	- "*** You have not yet configured your kernel!\n"
	10	- "*** (missing kernel .config file)\n"
	11	+ "*** You have not yet configured your " PROJECT_INFORMAL "!\n"
	12	+ "*** (missing " PROJECT_INFORMAL " .config file)\n"
	13	"***\n"
	14	"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
	15	"*** \"make menuconfig\" or \"make xconfig\").\n"
	16	@@ -604,7 +604,7 @@ int main(int ac, char **av)
	17	} else if (conf_get_changed()) {
	18	name = getenv("KCONFIG_NOSILENTUPDATE");
	19	if (name && *name) {
	20	- fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
	21	+ fprintf(stderr, _("\n*** " PROJECT " configuration requires explicit update.\n\n"));
	22	return 1;
	23	}
	24	} else
	25	@@ -615,12 +615,12 @@ int main(int ac, char **av)
	26	check_conf(&rootmenu);
	27	} while (conf_cnt);
	28	if (conf_write(NULL)) {
	29	- fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
	30	+ fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
	31	return 1;
	32	}
	33	skip_check:
	34	if (input_mode == ask_silent && conf_write_autoconf()) {
	35	- fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
	36	+ fprintf(stderr, _("\n*** Error during writing of the " PROJECT_INFORMAL " configuration.\n\n"));
	37	return 1;
	38	}
	39
	40	diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
	41	index 664fe29..06366ed 100644
	42	--- a/scripts/kconfig/confdata.c
	43	+++ b/scripts/kconfig/confdata.c
	44	@@ -416,7 +416,7 @@ int conf_write(const char *name)
	45	if (!out)
	46	return 1;
	47
	48	- sym = sym_lookup("KERNELVERSION", 0);
	49	+ sym = sym_lookup(VERSION_SYMBOL, 0);
	50	sym_calc_value(sym);
	51	time(&now);
	52	env = getenv("KCONFIG_NOTIMESTAMP");
	53	@@ -425,7 +425,7 @@ int conf_write(const char *name)
	54
	55	fprintf(out, _("#\n"
	56	"# Automatically generated make config: don't edit\n"
	57	- "# Linux kernel version: %s\n"
	58	+ "# " PROJECT " version: %s\n"
	59	"%s%s"
	60	"#\n"),
	61	sym_get_string_value(sym),
	62	@@ -672,21 +672,21 @@ int conf_write_autoconf(void)
	63	return 1;
	64	}
65
66	- sym = sym_lookup("KERNELVERSION", 0);
67	+ sym = sym_lookup(VERSION_SYMBOL, 0);
68	sym_calc_value(sym);
69	time(&now);
70	fprintf(out, "#\n"
71	"# Automatically generated make config: don't edit\n"
72	- "# Linux kernel version: %s\n"
73	+ "# " PROJECT " version: %s\n"
74	"# %s"
75	"#\n",
76	sym_get_string_value(sym), ctime(&now));
77	fprintf(out_h, "/*\n"
78	" * Automatically generated C config: don't edit\n"
79	- " * Linux kernel version: %s\n"
80	+ " * " PROJECT " version: %s\n"
81	" * %s"
82	" */\n"
83	- "#define AUTOCONF_INCLUDED\n",
84	+ "#define " AUTOCONF_DEFINE "\n",
85	sym_get_string_value(sym), ctime(&now));
86
87	for_all_symbols(i, sym) {
88	diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
89	index 61d8166..ba62d64 100644
90	--- a/scripts/kconfig/gconf.c
91	+++ b/scripts/kconfig/gconf.c
92	@@ -271,8 +271,8 @@ void init_main_window(const gchar * glade_file)
93	/"style", PANGO_STYLE_OBLIQUE, /
94	NULL);
95
96	- sprintf(title, _("Linux Kernel v%s Configuration"),
97	- getenv("KERNELVERSION"));
98	+ sprintf(title, _(PROJECT " v%s Configuration"),
99	+ getenv(VERSION_SYMBOL));
100	gtk_window_set_title(GTK_WINDOW(main_wnd), title);
101
102	gtk_widget_show(main_wnd);
103	diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
104	index 8a07ee4..e694cda 100644
105	--- a/scripts/kconfig/lkc.h
106	+++ b/scripts/kconfig/lkc.h
107	@@ -6,6 +6,8 @@
108	#ifndef LKC_H
109	#define LKC_H
110
111	+#include "lkc_local.h"
112	+
113	#include "expr.h"
114
115	#ifndef KBUILD_NO_NLS
116	diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
117	index d0e4fa5..344f777 100644
118	--- a/scripts/kconfig/mconf.c
119	+++ b/scripts/kconfig/mconf.c
120	@@ -400,10 +400,10 @@ static void set_config_filename(const char *config_filename)
121	int size;
122	struct symbol *sym;
123
124	- sym = sym_lookup("KERNELVERSION", 0);
125	+ sym = sym_lookup(VERSION_SYMBOL, 0);
126	sym_calc_value(sym);
127	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
128	- _("%s - Linux Kernel v%s Configuration"),
129	+ _("%s - " PROJECT " v%s Configuration"),
130	config_filename, sym_get_string_value(sym));
131	if (size >= sizeof(menu_backtitle))
132	menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
133	@@ -931,8 +931,8 @@ int main(int ac, char **av)
134	}
135	case -1:
136	printf(_("\n\n"
137	- "*** End of Linux kernel configuration.\n"
138	- "*** Execute 'make' to build the kernel or try 'make help'."
139	+ "*** End of " PROJECT " configuration.\n"
140	+ "*** Execute 'make' to build the " PROJECT_INFORMAL " or try 'make help'."
141	"\n\n"));
142	break;
143	default:
144	diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
145	index c35dcc5..004b7df 100644
146	--- a/scripts/kconfig/symbol.c
147	+++ b/scripts/kconfig/symbol.c
148	@@ -61,10 +61,10 @@ void sym_init(void)
149	if (p)
150	sym_add_default(sym, p);
151
152	- sym = sym_lookup("KERNELVERSION", 0);
153	+ sym = sym_lookup(VERSION_SYMBOL, 0);
154	sym->type = S_STRING;
155	sym->flags \|= SYMBOL_AUTO;
156	- p = getenv("KERNELVERSION");
157	+ p = getenv(VERSION_SYMBOL);
158	if (p)
159	sym_add_default(sym, p);
160