package/config: rebase against 2.6.37-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

1 files changed, 6 insertions, 252 deletions

diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/package/config/patches/01-kconfig-kernel-to-buildroot.patch
index 08fabc13a..a7d729de0 100644
--- a/package/config/patches/01-kconfig-kernel-to-buildroot.patch
+++ b/package/config/patches/01-kconfig-kernel-to-buildroot.patch
@@ -1,134 +1,15 @@
 ---
- conf.c              |   12 ++++++------
- confdata.c          |   14 +++++++-------
- gconf.c             |    4 ++--
  gconf.glade         |    2 +-
- mconf.c             |   38 ++++++++++++++++++--------------------
- qconf.cc            |    4 ++--
+ mconf.c             |    4 ++--
  zconf.tab.c_shipped |    2 +-
  zconf.y             |    2 +-
- 8 files changed, 38 insertions(+), 40 deletions(-)
+ 4 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: config/conf.c
-===================================================================
---- config.orig/conf.c
-+++ config/conf.c
-@@ -508,8 +508,8 @@
- 		name = conf_get_configname();
- 		if (stat(name, &tmpstat)) {
- 			fprintf(stderr, _("***\n"
--				"*** You have not yet configured your kernel!\n"
--				"*** (missing kernel config file \"%s\")\n"
-+				"*** You have not yet configured your Buildroot!\n"
-+				"*** (missing .config file \"%s\")\n"
- 				"***\n"
- 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
- 				"*** \"make menuconfig\" or \"make xconfig\").\n"
-@@ -571,7 +571,7 @@
- 			name = getenv("KCONFIG_NOSILENTUPDATE");
- 			if (name && *name) {
- 				fprintf(stderr,
--					_("\n*** Kernel configuration requires explicit update.\n\n"));
-+					_("\n*** Buildroot configuration requires explicit update.\n\n"));
- 				return 1;
- 			}
- 		}
-@@ -623,11 +623,11 @@
- 		 * All other commands are only used to generate a config.
- 		 */
- 		if (conf_get_changed() && conf_write(NULL)) {
--			fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
-+			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
- 			exit(1);
- 		}
- 		if (conf_write_autoconf()) {
--			fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n"));
-+			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));
- 			return 1;
- 		}
- 	} else if (input_mode == savedefconfig) {
-@@ -638,7 +638,7 @@
- 		}
- 	} else if (input_mode != listnewconfig) {
- 		if (conf_write(NULL)) {
--			fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
-+			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
- 			exit(1);
- 		}
- 	}
-Index: config/confdata.c
-===================================================================
---- config.orig/confdata.c
-+++ config/confdata.c
-@@ -581,7 +581,7 @@
- 	if (!out)
- 		return 1;
- 
--	sym = sym_lookup("KERNELVERSION", 0);
-+	sym = sym_lookup("BR2_VERSION", 0);
- 	sym_calc_value(sym);
- 	time(&now);
- 	env = getenv("KCONFIG_NOTIMESTAMP");
-@@ -590,7 +590,7 @@
- 
- 	fprintf(out, _("#\n"
- 		       "# Automatically generated make config: don't edit\n"
--		       "# Linux kernel version: %s\n"
-+		       "# Buildroot version: %s\n"
- 		       "%s%s"
- 		       "#\n"),
- 		     sym_get_string_value(sym),
-@@ -804,25 +804,25 @@
- 		return 1;
- 	}
- 
--	sym = sym_lookup("KERNELVERSION", 0);
-+	sym = sym_lookup("BR2_VERSION", 0);
- 	sym_calc_value(sym);
- 	time(&now);
- 	fprintf(out, "#\n"
- 		     "# Automatically generated make config: don't edit\n"
--		     "# Linux kernel version: %s\n"
-+		     "# Buildroot version: %s\n"
- 		     "# %s"
- 		     "#\n",
--		     sym_get_string_value(sym), ctime(&now));
-+		     sym_get_string_value(sym),
-+		     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"
- 		       "#define AUTOCONF_INCLUDED\n",
--		       sym_get_string_value(sym), ctime(&now));
-+		       ctime(&now));
- 
- 	for_all_symbols(i, sym) {
- 		sym_calc_value(sym);
-Index: config/gconf.c
-===================================================================
---- config.orig/gconf.c
-+++ config/gconf.c
-@@ -210,8 +210,8 @@
- 					  /*"style", PANGO_STYLE_OBLIQUE, */
- 					  NULL);
- 
--	sprintf(title, _("Linux Kernel v%s Configuration"),
--		getenv("KERNELVERSION"));
-+	sprintf(title, _("Buildroot v%s Configuration"),
-+		getenv("BR2_VERSION"));
- 	gtk_window_set_title(GTK_WINDOW(main_wnd), title);
- 
- 	gtk_widget_show(main_wnd);
 Index: config/gconf.glade
 ===================================================================
 --- config.orig/gconf.glade
 +++ config/gconf.glade
-@@ -5,7 +5,7 @@
+@@ -4,7 +4,7 @@
  
  <widget class="GtkWindow" id="window1">
    <property name="visible">True</property>
@@ -141,38 +22,7 @@ Index: config/mconf.c
 ===================================================================
 --- config.orig/mconf.c
 +++ config/mconf.c
-@@ -25,10 +25,9 @@
- static const char mconf_readme[] = N_(
- "Overview\n"
- "--------\n"
--"Some kernel features may be built directly into the kernel.\n"
--"Some may be made into loadable runtime modules.  Some features\n"
-+"Some features may be built directly into Buildroot. Some features\n"
- "may be completely removed altogether.  There are also certain\n"
--"kernel parameters which are not really features, but must be\n"
-+"parameters which are not really features, but must be\n"
- "entered in as decimal or hexadecimal numbers or possibly text.\n"
- "\n"
- "Menu items beginning with following braces represent features that\n"
-@@ -117,7 +116,7 @@
- "-----------------------------\n"
- "Menuconfig supports the use of alternate configuration files for\n"
- "those who, for various reasons, find it necessary to switch\n"
--"between different kernel configurations.\n"
-+"between different configurations.\n"
- "\n"
- "At the end of the main menu you will find two options.  One is\n"
- "for saving the current configuration to a file of your choosing.\n"
-@@ -150,7 +149,7 @@
- "\n"
- "Optional personality available\n"
- "------------------------------\n"
--"If you prefer to have all of the kernel options listed in a single\n"
-+"If you prefer to have all of the options listed in a single\n"
- "menu, rather than the default multimenu hierarchy, run the menuconfig\n"
- "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
- "\n"
-@@ -180,9 +179,9 @@
+@@ -178,9 +178,9 @@
  	"Arrow keys navigate the menu.  "
  	"<Enter> selects submenus --->.  "
  	"Highlighted letters are hotkeys.  "
@@ -184,107 +34,11 @@ Index: config/mconf.c
  radiolist_instructions[] = N_(
  	"Use the arrow keys to navigate this window or "
  	"press the hotkey of the item you wish to select "
-@@ -207,11 +206,11 @@
- 	"last retrieved.  Leave blank to abort."),
- load_config_help[] = N_(
- 	"\n"
--	"For various reasons, one may wish to keep several different kernel\n"
-+	"For various reasons, one may wish to keep several different Buildroot\n"
- 	"configurations available on a single machine.\n"
- 	"\n"
- 	"If you have saved a previous configuration in a file other than the\n"
--	"kernel's default, entering the name of the file here will allow you\n"
-+	"Buildroot's default, entering the name of the file here will allow you\n"
- 	"to modify that configuration.\n"
- 	"\n"
- 	"If you are uncertain, then you have probably never used alternate\n"
-@@ -221,7 +220,7 @@
- 	"as an alternate.  Leave blank to abort."),
- save_config_help[] = N_(
- 	"\n"
--	"For various reasons, one may wish to keep different kernel\n"
-+	"For various reasons, one may wish to keep different Buildroot\n"
- 	"configurations available on a single machine.\n"
- 	"\n"
- 	"Entering a file name here will allow you to later retrieve, modify\n"
-@@ -292,10 +291,10 @@
- 	int size;
- 	struct symbol *sym;
- 
--	sym = sym_lookup("KERNELVERSION", 0);
-+	sym = sym_lookup("BR2_VERSION", 0);
- 	sym_calc_value(sym);
- 	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
--	                _("%s - Linux Kernel v%s Configuration"),
-+	                _("%s - buildroot v%s Configuration"),
- 		        config_filename, sym_get_string_value(sym));
- 	if (size >= sizeof(menu_backtitle))
- 		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
-@@ -316,8 +315,7 @@
- again:
- 	dialog_clear();
- 	dres = dialog_inputbox(_("Search Configuration Parameter"),
--			      _("Enter CONFIG_ (sub)string to search for "
--				"(with or without \"CONFIG\")"),
-+			      _("Enter (sub)string to search for"),
- 			      10, 75, "");
- 	switch (dres) {
- 	case 0:
-@@ -834,7 +832,7 @@
- 		if (conf_get_changed())
- 			res = dialog_yesno(NULL,
- 					   _("Do you wish to save your "
--					     "new kernel configuration?\n"
-+					     "new Buildroot configuration?\n"
- 					     "<ESC><ESC> to continue."),
- 					   6, 60);
- 		else
-@@ -846,20 +844,20 @@
- 	case 0:
- 		if (conf_write(filename)) {
- 			fprintf(stderr, _("\n\n"
--				"Error during writing of the kernel configuration.\n"
--				"Your kernel configuration changes were NOT saved."
-+				"Error during writing of the Buildroot configuration.\n"
-+				"Your Buildroot configuration changes were NOT saved."
- 				"\n\n"));
- 			return 1;
- 		}
- 	case -1:
- 		printf(_("\n\n"
--			"*** End of Linux kernel configuration.\n"
--			"*** Execute 'make' to build the kernel or try 'make help'."
-+			"*** End of Buildroot configuration.\n"
-+			"*** Execute 'make' to build Buildroot or try 'make help'."
- 			"\n\n"));
- 		break;
- 	default:
- 		fprintf(stderr, _("\n\n"
--			"Your kernel configuration changes were NOT saved."
-+			"Your Buildroot configuration changes were NOT saved."
- 			"\n\n"));
- 	}
- 
-Index: config/qconf.cc
-===================================================================
---- config.orig/qconf.cc
-+++ config/qconf.cc
-@@ -1263,8 +1263,8 @@
- 	char title[256];
- 
- 	QDesktopWidget *d = configApp->desktop();
--	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
--		getenv("KERNELVERSION"));
-+	snprintf(title, sizeof(title), _("Buildroot v%s Configuration"),
-+		getenv("BR2_VERSION"));
- 	setCaption(title);
- 
- 	width = configSettings->readNumEntry("/window width", d->width() - 64);
 Index: config/zconf.tab.c_shipped
 ===================================================================
 --- config.orig/zconf.tab.c_shipped
 +++ config/zconf.tab.c_shipped
-@@ -2224,7 +2224,7 @@
+@@ -2239,7 +2239,7 @@
  	modules_sym = sym_lookup(NULL, 0);
  	modules_sym->type = S_BOOLEAN;
  	modules_sym->flags |= SYMBOL_AUTO;
@@ -297,7 +51,7 @@ Index: config/zconf.y
 ===================================================================
 --- config.orig/zconf.y
 +++ config/zconf.y
-@@ -479,7 +479,7 @@
+@@ -487,7 +487,7 @@
  	modules_sym = sym_lookup(NULL, 0);
  	modules_sym->type = S_BOOLEAN;
  	modules_sym->flags |= SYMBOL_AUTO;