Bump package/config to 2.6.36-rc1

The goal is to be able to use savedefconfig to generate minimal
defconfig files.

Four of our patches are removed since the modifications have been
merged upstream. The new nconf configuration utility has appeared.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

13 files changed, 211 insertions, 535 deletions

diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/package/config/patches/01-kconfig-kernel-to-buildroot.patch
index 5fed731a4..4e4354a0c 100644
--- a/package/config/patches/01-kconfig-kernel-to-buildroot.patch
+++ b/package/config/patches/01-kconfig-kernel-to-buildroot.patch
@@ -3,28 +3,28 @@
  confdata.c          |   12 ++++--------
  gconf.c             |    4 ++--
  gconf.glade         |    2 +-
- mconf.c             |   37 ++++++++++++++++++-------------------
- qconf.cc            |    3 +--
+ mconf.c             |   35 +++++++++++++++++------------------
+ qconf.cc            |    4 ++--
  zconf.tab.c_shipped |    2 +-
  zconf.y             |    2 +-
- 8 files changed, 34 insertions(+), 40 deletions(-)
+ 8 files changed, 34 insertions(+), 39 deletions(-)
 
-Index: config.clean/conf.c
+Index: config.new/conf.c
 ===================================================================
---- config.clean.orig/conf.c
-+++ config.clean/conf.c
-@@ -500,8 +500,8 @@
- 	if (sync_kconfig) {
- 		if (stat(".config", &tmpstat)) {
+--- config.new.orig/conf.c
++++ config.new/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)\n"
-+				"*** You have not yet configured Buildroot!\n"
-+				"*** (missing .config file)\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"
-@@ -556,7 +556,7 @@
+@@ -571,7 +571,7 @@
  			name = getenv("KCONFIG_NOSILENTUPDATE");
  			if (name && *name) {
  				fprintf(stderr,
@@ -33,7 +33,7 @@ Index: config.clean/conf.c
  				return 1;
  			}
  		}
-@@ -599,16 +599,16 @@
+@@ -623,11 +623,11 @@
  		 * All other commands are only used to generate a config.
  		 */
  		if (conf_get_changed() && conf_write(NULL)) {
@@ -46,18 +46,21 @@ Index: config.clean/conf.c
 +			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));
  			return 1;
  		}
- 	} else {
+ 	} 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.clean/confdata.c
+Index: config.new/confdata.c
 ===================================================================
---- config.clean.orig/confdata.c
-+++ config.clean/confdata.c
-@@ -436,7 +436,7 @@
+--- config.new.orig/confdata.c
++++ config.new/confdata.c
+@@ -579,7 +579,7 @@
  	if (!out)
  		return 1;
  
@@ -66,7 +69,7 @@ Index: config.clean/confdata.c
  	sym_calc_value(sym);
  	time(&now);
  	env = getenv("KCONFIG_NOTIMESTAMP");
-@@ -445,10 +445,8 @@
+@@ -588,10 +588,8 @@
  
  	fprintf(out, _("#\n"
  		       "# Automatically generated make config: don't edit\n"
@@ -77,7 +80,7 @@ Index: config.clean/confdata.c
  		     use_timestamp ? "# " : "",
  		     use_timestamp ? ctime(&now) : "");
  
-@@ -692,22 +690,20 @@
+@@ -802,25 +800,23 @@
  		return 1;
  	}
  
@@ -92,6 +95,9 @@ Index: config.clean/confdata.c
  		     "#\n",
 -		     sym_get_string_value(sym), ctime(&now));
 +		     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"
@@ -103,11 +109,11 @@ Index: config.clean/confdata.c
  
  	for_all_symbols(i, sym) {
  		sym_calc_value(sym);
-Index: config.clean/gconf.c
+Index: config.new/gconf.c
 ===================================================================
---- config.clean.orig/gconf.c
-+++ config.clean/gconf.c
-@@ -266,8 +266,8 @@
+--- config.new.orig/gconf.c
++++ config.new/gconf.c
+@@ -210,8 +210,8 @@
  					  /*"style", PANGO_STYLE_OBLIQUE, */
  					  NULL);
  
@@ -118,10 +124,10 @@ Index: config.clean/gconf.c
  	gtk_window_set_title(GTK_WINDOW(main_wnd), title);
  
  	gtk_widget_show(main_wnd);
-Index: config.clean/gconf.glade
+Index: config.new/gconf.glade
 ===================================================================
---- config.clean.orig/gconf.glade
-+++ config.clean/gconf.glade
+--- config.new.orig/gconf.glade
++++ config.new/gconf.glade
 @@ -5,7 +5,7 @@
  
  <widget class="GtkWindow" id="window1">
@@ -131,10 +137,10 @@ Index: config.clean/gconf.glade
    <property name="type">GTK_WINDOW_TOPLEVEL</property>
    <property name="window_position">GTK_WIN_POS_NONE</property>
    <property name="modal">False</property>
-Index: config.clean/mconf.c
+Index: config.new/mconf.c
 ===================================================================
---- config.clean.orig/mconf.c
-+++ config.clean/mconf.c
+--- config.new.orig/mconf.c
++++ config.new/mconf.c
 @@ -25,10 +25,9 @@
  static const char mconf_readme[] = N_(
  "Overview\n"
@@ -148,7 +154,7 @@ Index: config.clean/mconf.c
  "entered in as decimal or hexadecimal numbers or possibly text.\n"
  "\n"
  "Menu items beginning with following braces represent features that\n"
-@@ -115,7 +114,7 @@
+@@ -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"
@@ -157,7 +163,7 @@ Index: config.clean/mconf.c
  "\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"
-@@ -148,7 +147,7 @@
+@@ -150,7 +149,7 @@
  "\n"
  "Optional personality available\n"
  "------------------------------\n"
@@ -166,7 +172,7 @@ Index: config.clean/mconf.c
  "menu, rather than the default multimenu hierarchy, run the menuconfig\n"
  "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
  "\n"
-@@ -178,9 +177,9 @@
+@@ -180,9 +179,9 @@
  	"Arrow keys navigate the menu.  "
  	"<Enter> selects submenus --->.  "
  	"Highlighted letters are hotkeys.  "
@@ -178,15 +184,7 @@ Index: config.clean/mconf.c
  radiolist_instructions[] = N_(
  	"Use the arrow keys to navigate this window or "
  	"press the hotkey of the item you wish to select "
-@@ -200,18 +199,18 @@
- 	"This feature depends on another which has been configured as a module.\n"
- 	"As a result, this feature will be built as a module."),
- nohelp_text[] = N_(
--	"There is no help available for this kernel option.\n"),
-+	"There is no help available for this option.\n"),
- load_config_text[] = N_(
- 	"Enter the name of the configuration file you wish to load.  "
- 	"Accept the name shown to restore the configuration you "
+@@ -207,11 +206,11 @@
  	"last retrieved.  Leave blank to abort."),
  load_config_help[] = N_(
  	"\n"
@@ -209,7 +207,7 @@ Index: config.clean/mconf.c
  	"configurations available on a single machine.\n"
  	"\n"
  	"Entering a file name here will allow you to later retrieve, modify\n"
-@@ -364,10 +363,10 @@
+@@ -292,10 +291,10 @@
  	int size;
  	struct symbol *sym;
  
@@ -222,7 +220,7 @@ Index: config.clean/mconf.c
  		        config_filename, sym_get_string_value(sym));
  	if (size >= sizeof(menu_backtitle))
  		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
-@@ -894,7 +893,7 @@
+@@ -834,7 +833,7 @@
  		if (conf_get_changed())
  			res = dialog_yesno(NULL,
  					   _("Do you wish to save your "
@@ -231,7 +229,7 @@ Index: config.clean/mconf.c
  					     "<ESC><ESC> to continue."),
  					   6, 60);
  		else
-@@ -906,20 +905,20 @@
+@@ -846,20 +845,20 @@
  	case 0:
  		if (conf_write(filename)) {
  			fprintf(stderr, _("\n\n"
@@ -257,25 +255,26 @@ Index: config.clean/mconf.c
  			"\n\n"));
  	}
  
-Index: config.clean/qconf.cc
+Index: config.new/qconf.cc
 ===================================================================
---- config.clean.orig/qconf.cc
-+++ config.clean/qconf.cc
-@@ -1276,8 +1276,7 @@
+--- config.new.orig/qconf.cc
++++ config.new/qconf.cc
+@@ -1263,8 +1263,8 @@
  	char title[256];
  
- 	QWidget *d = configApp->desktop();
+ 	QDesktopWidget *d = configApp->desktop();
 -	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
 -		getenv("KERNELVERSION"));
-+	snprintf(title, sizeof(title), _("Buildroot Configuration"));
++	snprintf(title, sizeof(title), _("Buildroot v%s Configuration"),
++		getenv("BR2_VERSION"));
  	setCaption(title);
  
  	width = configSettings->readNumEntry("/window width", d->width() - 64);
-Index: config.clean/zconf.tab.c_shipped
+Index: config.new/zconf.tab.c_shipped
 ===================================================================
---- config.clean.orig/zconf.tab.c_shipped
-+++ config.clean/zconf.tab.c_shipped
-@@ -2259,7 +2259,7 @@
+--- config.new.orig/zconf.tab.c_shipped
++++ config.new/zconf.tab.c_shipped
+@@ -2224,7 +2224,7 @@
  	modules_sym = sym_lookup(NULL, 0);
  	modules_sym->type = S_BOOLEAN;
  	modules_sym->flags |= SYMBOL_AUTO;
@@ -284,11 +283,11 @@ Index: config.clean/zconf.tab.c_shipped
  
  #if YYDEBUG
  	if (getenv("ZCONF_DEBUG"))
-Index: config.clean/zconf.y
+Index: config.new/zconf.y
 ===================================================================
---- config.clean.orig/zconf.y
-+++ config.clean/zconf.y
-@@ -476,7 +476,7 @@
+--- config.new.orig/zconf.y
++++ config.new/zconf.y
+@@ -479,7 +479,7 @@
  	modules_sym = sym_lookup(NULL, 0);
  	modules_sym->type = S_BOOLEAN;
  	modules_sym->flags |= SYMBOL_AUTO;
diff --git a/package/config/patches/03-change-config-option-prefix.patch b/package/config/patches/03-change-config-option-prefix.patch
index a786078c6..5b76df33e 100644
--- a/package/config/patches/03-change-config-option-prefix.patch
+++ b/package/config/patches/03-change-config-option-prefix.patch
@@ -1,11 +1,11 @@
 ---
- confdata.c |   57 +++++++++++++++++++++++++++------------------------------
- 1 file changed, 27 insertions(+), 30 deletions(-)
+ confdata.c |   49 +++++++++++++++++++++++--------------------------
+ 1 file changed, 23 insertions(+), 26 deletions(-)
 
-Index: config.clean/confdata.c
+Index: config.new/confdata.c
 ===================================================================
---- config.clean.orig/confdata.c
-+++ config.clean/confdata.c
+--- config.new.orig/confdata.c
++++ config.new/confdata.c
 @@ -11,6 +11,7 @@
  #include <string.h>
  #include <time.h>
@@ -32,7 +32,7 @@ Index: config.clean/confdata.c
  
  	return name ? name : ".config";
  }
-@@ -212,22 +213,22 @@
+@@ -222,22 +223,22 @@
  		sym = NULL;
  		switch (line[0]) {
  		case '#':
@@ -59,7 +59,7 @@ Index: config.clean/confdata.c
  				if (sym->type == S_UNKNOWN)
  					sym->type = S_BOOLEAN;
  			}
-@@ -244,12 +245,8 @@
+@@ -254,12 +255,8 @@
  				;
  			}
  			break;
@@ -74,7 +74,7 @@ Index: config.clean/confdata.c
  			if (!p)
  				continue;
  			*p++ = 0;
-@@ -260,13 +257,13 @@
+@@ -270,13 +267,13 @@
  					*p2 = 0;
  			}
  			if (def == S_DEF_USER) {
@@ -90,86 +90,74 @@ Index: config.clean/confdata.c
  				if (sym->type == S_UNKNOWN)
  					sym->type = S_OTHER;
  			}
-@@ -480,19 +477,19 @@
- 			case S_TRISTATE:
- 				switch (sym_get_tristate_value(sym)) {
- 				case no:
--					fprintf(out, "# CONFIG_%s is not set\n", sym->name);
-+					fprintf(out, "# %s is not set\n", sym->name);
- 					break;
- 				case mod:
--					fprintf(out, "CONFIG_%s=m\n", sym->name);
-+					fprintf(out, "%s=m\n", sym->name);
- 					break;
- 				case yes:
--					fprintf(out, "CONFIG_%s=y\n", sym->name);
-+					fprintf(out, "%s=y\n", sym->name);
- 					break;
- 				}
- 				break;
- 			case S_STRING:
- 				str = sym_get_string_value(sym);
--				fprintf(out, "CONFIG_%s=\"", sym->name);
-+				fprintf(out, "%s=\"", sym->name);
- 				while (1) {
- 					l = strcspn(str, "\"\\");
- 					if (l) {
-@@ -508,12 +505,12 @@
- 			case S_HEX:
- 				str = sym_get_string_value(sym);
- 				if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
--					fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
-+					fprintf(out, "%s=%s\n", sym->name, str);
- 					break;
- 				}
- 			case S_INT:
- 				str = sym_get_string_value(sym);
--				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
-+				fprintf(out, "%s=%s\n", sym->name, str);
- 				break;
- 			}
+@@ -405,9 +402,9 @@
+ {
+ 	int l;
+ 	if (headerfile)
+-		fprintf(out, "#define CONFIG_%s \"", name);
++		fprintf(out, "#define %s \"", name);
+ 	else
+-		fprintf(out, "CONFIG_%s=\"", name);
++		fprintf(out, "%s=\"", name);
+ 
+ 	while (1) {
+ 		l = strcspn(str, "\"\\");
+@@ -433,13 +430,13 @@
+ 		switch (sym_get_tristate_value(sym)) {
+ 		case no:
+ 			if (write_no)
+-				fprintf(out, "# CONFIG_%s is not set\n", sym->name);
++				fprintf(out, "# %s is not set\n", sym->name);
+ 			break;
+ 		case mod:
+-			fprintf(out, "CONFIG_%s=m\n", sym->name);
++			fprintf(out, "%s=m\n", sym->name);
+ 			break;
+ 		case yes:
+-			fprintf(out, "CONFIG_%s=y\n", sym->name);
++			fprintf(out, "%s=y\n", sym->name);
+ 			break;
  		}
-@@ -716,19 +713,19 @@
+ 		break;
+@@ -449,7 +446,7 @@
+ 	case S_HEX:
+ 	case S_INT:
+ 		str = sym_get_string_value(sym);
+-		fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
++		fprintf(out, "%s=%s\n", sym->name, str);
+ 		break;
+ 	case S_OTHER:
+ 	case S_UNKNOWN:
+@@ -834,14 +831,14 @@
  			case no:
  				break;
  			case mod:
--				fprintf(out, "CONFIG_%s=m\n", sym->name);
+-				fprintf(tristate, "CONFIG_%s=M\n", sym->name);
 -				fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
-+				fprintf(out, "%s=m\n", sym->name);
++				fprintf(tristate, "%s=M\n", sym->name);
 +				fprintf(out_h, "#define %s_MODULE 1\n", sym->name);
  				break;
  			case yes:
--				fprintf(out, "CONFIG_%s=y\n", sym->name);
+ 				if (sym->type == S_TRISTATE)
+-					fprintf(tristate, "CONFIG_%s=Y\n",
++					fprintf(tristate, "%s=Y\n",
+ 							sym->name);
 -				fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
-+				fprintf(out, "%s=y\n", sym->name);
 +				fprintf(out_h, "#define %s 1\n", sym->name);
  				break;
  			}
  			break;
- 		case S_STRING:
- 			str = sym_get_string_value(sym);
--			fprintf(out, "CONFIG_%s=\"", sym->name);
--			fprintf(out_h, "#define CONFIG_%s \"", sym->name);
-+			fprintf(out, "%s=\"", sym->name);
-+			fprintf(out_h, "#define %s \"", sym->name);
- 			while (1) {
- 				l = strcspn(str, "\"\\");
- 				if (l) {
-@@ -748,14 +745,14 @@
+@@ -851,12 +848,12 @@
  		case S_HEX:
  			str = sym_get_string_value(sym);
  			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
--				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
 -				fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
-+				fprintf(out, "%s=%s\n", sym->name, str);
 +				fprintf(out_h, "#define %s 0x%s\n", sym->name, str);
  				break;
  			}
  		case S_INT:
  			str = sym_get_string_value(sym);
--			fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
 -			fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
-+			fprintf(out, "%s=%s\n", sym->name, str);
 +			fprintf(out_h, "#define %s %s\n", sym->name, str);
  			break;
  		default:
diff --git a/package/config/patches/04-fedora-13-build-fix.patch b/package/config/patches/04-fedora-13-build-fix.patch
deleted file mode 100644
index 4fa72df6e..000000000
--- a/package/config/patches/04-fedora-13-build-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: config.clean/Makefile
-===================================================================
---- config.clean.orig/Makefile
-+++ config.clean/Makefile
-@@ -165,7 +165,7 @@
- HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl
- HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
- 
--HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
-+HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
- HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-                           -D LKC_DIRECT_LINK
- 
diff --git a/package/config/patches/05-really-clean-everything.patch b/package/config/patches/05-really-clean-everything.patch
index c206f5582..f8d8a39d2 100644
--- a/package/config/patches/05-really-clean-everything.patch
+++ b/package/config/patches/05-really-clean-everything.patch
@@ -1,24 +1,25 @@
 ---
- Makefile |   13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
+ Makefile |   14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
 
-Index: config.clean/Makefile
+Index: config.new/Makefile
 ===================================================================
---- config.clean.orig/Makefile
-+++ config.clean/Makefile
-@@ -142,10 +142,15 @@
+--- config.new.orig/Makefile
++++ config.new/Makefile
+@@ -199,10 +199,16 @@
  gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
  endif
  
 -clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
 -		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
--clean-files     += mconf qconf gconf
+-clean-files     += mconf qconf gconf nconf
 -clean-files     += config.pot linux.pot
 +clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
 +               .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 +clean-files += config.pot linux.pot
 +clean-files += conf $(conf-objs)
 +clean-files += mconf $(mconf-objs)
++clean-files += nconf $(nconf-objs)
 +clean-files += qconf qconf.o
 +clean-files += gconf gconf.o
 +clean-files += kconfig_load.o zconf.tab.o
diff --git a/package/config/patches/06-br-build-system-integration.patch b/package/config/patches/06-br-build-system-integration.patch
index 1e340f3f8..a2e634ffd 100644
--- a/package/config/patches/06-br-build-system-integration.patch
+++ b/package/config/patches/06-br-build-system-integration.patch
@@ -2,11 +2,11 @@
  Makefile |   11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
-Index: config.clean/Makefile
+Index: config.new/Makefile
 ===================================================================
---- config.clean.orig/Makefile
-+++ config.clean/Makefile
-@@ -124,14 +124,23 @@
+--- config.new.orig/Makefile
++++ config.new/Makefile
+@@ -181,14 +181,23 @@
  ifeq ($(MAKECMDGOALS),menuconfig)
  	hostprogs-y += mconf
  endif
diff --git a/package/config/patches/07-minor-makefile-fixes.patch b/package/config/patches/07-minor-makefile-fixes.patch
deleted file mode 100644
index f0f68ee22..000000000
--- a/package/config/patches/07-minor-makefile-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: config.clean/Makefile
-===================================================================
---- config.clean.orig/Makefile
-+++ config.clean/Makefile
-@@ -83,7 +83,7 @@
- 	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
- 	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
- 	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
--	@echo  '  silentoldconfig - Same as oldconfig, but quietly'
-+	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
- 	@echo  '  randconfig	  - New config with random answer to all options'
- 	@echo  '  defconfig	  - New config with default answer to all options'
- 	@echo  '  allmodconfig	  - New config selecting modules when possible'
-@@ -104,7 +104,7 @@
- # ===========================================================================
- # Shared Makefile for the various kconfig executables:
- # conf:	  Used for defconfig, oldconfig and related targets
--# mconf:  Used for the mconfig target.
-+# mconf:  Used for the menuconfig target
- #         Utilizes the lxdialog package
- # qconf:  Used for the xconfig target
- #         Based on QT which needs to be installed to compile it
diff --git a/package/config/patches/09-implement-kconfig-probability.patch b/package/config/patches/09-implement-kconfig-probability.patch
index 7adfc0b17..7561fbc3c 100644
--- a/package/config/patches/09-implement-kconfig-probability.patch
+++ b/package/config/patches/09-implement-kconfig-probability.patch
@@ -1,17 +1,17 @@
 ---
- confdata.c |   21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
+ confdata.c |   22 +++++++++++++++++++---
+ 1 file changed, 19 insertions(+), 3 deletions(-)
 
-Index: config.clean/confdata.c
+Index: config/confdata.c
 ===================================================================
---- config.clean.orig/confdata.c
-+++ config.clean/confdata.c
-@@ -812,7 +812,16 @@
+--- config.orig/confdata.c
++++ config/confdata.c
+@@ -977,7 +977,16 @@
+ void conf_set_all_new_symbols(enum conf_def_mode mode)
+ {
  	struct symbol *sym, *csym;
- 	struct property *prop;
- 	struct expr *e;
--	int i, cnt, def;
-+	int i, cnt, def, prob = 50;
+-	int i, cnt;
++	int i, cnt, prob = 50;
 +
 +	if (mode == def_random) {
 +		char *endp, *env = getenv("KCONFIG_PROBABILITY");
@@ -24,11 +24,12 @@ Index: config.clean/confdata.c
  
  	for_all_symbols(i, sym) {
  		if (sym_has_value(sym))
-@@ -831,7 +840,15 @@
+@@ -996,8 +1005,15 @@
  				sym->def[S_DEF_USER].tri = no;
  				break;
  			case def_random:
--				sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);
+-				cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2;
+-				sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt);
 +				cnt = (rand() % 100) - (100 - prob);
 +				if (cnt < 0)
 +					sym->def[S_DEF_USER].tri = no;
diff --git a/package/config/patches/12-fix-glade-file-path.patch b/package/config/patches/12-fix-glade-file-path.patch
index 233809aaf..10c7e9163 100644
--- a/package/config/patches/12-fix-glade-file-path.patch
+++ b/package/config/patches/12-fix-glade-file-path.patch
@@ -2,11 +2,11 @@
  gconf.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: config.clean/gconf.c
+Index: config.new/gconf.c
 ===================================================================
---- config.clean.orig/gconf.c
-+++ config.clean/gconf.c
-@@ -1576,7 +1576,7 @@
+--- config.new.orig/gconf.c
++++ config.new/gconf.c
+@@ -1525,7 +1525,7 @@
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
  	if (env)
diff --git a/package/config/patches/13-use-conf-write-autoconf.patch b/package/config/patches/13-use-conf-write-autoconf.patch
index 826852df4..8297dd952 100644
--- a/package/config/patches/13-use-conf-write-autoconf.patch
+++ b/package/config/patches/13-use-conf-write-autoconf.patch
@@ -4,11 +4,11 @@
  qconf.cc |    2 ++
  3 files changed, 7 insertions(+), 1 deletion(-)
 
-Index: config.clean/conf.c
+Index: config.new/conf.c
 ===================================================================
---- config.clean.orig/conf.c
-+++ config.clean/conf.c
-@@ -611,6 +611,10 @@
+--- config.new.orig/conf.c
++++ config.new/conf.c
+@@ -641,6 +641,10 @@
  			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
  			exit(1);
  		}
@@ -19,11 +19,11 @@ Index: config.clean/conf.c
  	}
  	return 0;
  }
-Index: config.clean/mconf.c
+Index: config.new/mconf.c
 ===================================================================
---- config.clean.orig/mconf.c
-+++ config.clean/mconf.c
-@@ -922,6 +922,6 @@
+--- config.new.orig/mconf.c
++++ config.new/mconf.c
+@@ -862,6 +862,6 @@
  			"\n\n"));
  	}
  
@@ -31,11 +31,11 @@ Index: config.clean/mconf.c
 +	return conf_write_autoconf();
  }
  
-Index: config.clean/qconf.cc
+Index: config.new/qconf.cc
 ===================================================================
---- config.clean.orig/qconf.cc
-+++ config.clean/qconf.cc
-@@ -1608,6 +1608,7 @@
+--- config.new.orig/qconf.cc
++++ config.new/qconf.cc
+@@ -1612,6 +1612,7 @@
  {
  	if (!conf_get_changed()) {
  		e->accept();
@@ -43,7 +43,7 @@ Index: config.clean/qconf.cc
  		return;
  	}
  	QMessageBox mb("qconf", _("Save configuration?"), QMessageBox::Warning,
-@@ -1618,6 +1619,7 @@
+@@ -1622,6 +1623,7 @@
  	switch (mb.exec()) {
  	case QMessageBox::Yes:
  		conf_write(NULL);
diff --git a/package/config/patches/14-support-out-of-tree-config.patch b/package/config/patches/14-support-out-of-tree-config.patch
index 4aae0c154..fb1cca1a8 100644
--- a/package/config/patches/14-support-out-of-tree-config.patch
+++ b/package/config/patches/14-support-out-of-tree-config.patch
@@ -1,52 +1,37 @@
 ---
- conf.c     |    8 +++---
- confdata.c |   71 ++++++++++++++++++++++++++++++++++++++++++++-----------------
- lkc.h      |    1 
- util.c     |   22 ++++++++++++++----
- 4 files changed, 74 insertions(+), 28 deletions(-)
+ conf.c     |    1 
+ confdata.c |   65 +++++++++++++++++++++++++++++++++++++++++++++----------------
+ util.c     |   16 +++++++++++++--
+ 3 files changed, 62 insertions(+), 20 deletions(-)
 
-Index: config.clean/conf.c
+Index: config/conf.c
 ===================================================================
---- config.clean.orig/conf.c
-+++ config.clean/conf.c
-@@ -496,16 +496,16 @@
+--- config.orig/conf.c
++++ config/conf.c
+@@ -503,7 +503,6 @@
  	}
  	name = av[optind];
  	conf_parse(name);
 -	//zconfdump(stdout);
  	if (sync_kconfig) {
--		if (stat(".config", &tmpstat)) {
-+		name = conf_get_configname();
-+		if (stat(name, &tmpstat)) {
- 			fprintf(stderr, _("***\n"
- 				"*** You have not yet configured Buildroot!\n"
--				"*** (missing .config file)\n"
-+				"*** (missing .config file \"%s\")\n"
- 				"***\n"
- 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
- 				"*** \"make menuconfig\" or \"make xconfig\").\n"
--				"***\n"));
-+				"***\n"), name);
- 			exit(1);
- 		}
- 	}
-Index: config.clean/confdata.c
+ 		name = conf_get_configname();
+ 		if (stat(name, &tmpstat)) {
+Index: config/confdata.c
 ===================================================================
---- config.clean.orig/confdata.c
-+++ config.clean/confdata.c
-@@ -42,6 +42,11 @@
- 	return name ? name : ".config";
- }
+--- config.orig/confdata.c
++++ config/confdata.c
+@@ -44,9 +44,7 @@
  
-+const char *conf_get_autoconfig_name(void)
-+{
+ const char *conf_get_autoconfig_name(void)
+ {
+-	char *name = getenv("KCONFIG_AUTOCONFIG");
+-
+-	return name ? name : "include/config/auto.conf";
 +	return getenv("KCONFIG_AUTOCONFIG");
-+}
-+
+ }
+ 
  static char *conf_expand_value(const char *in)
- {
- 	struct symbol *sym;
-@@ -399,6 +404,9 @@
+@@ -542,6 +540,9 @@
  	int use_timestamp = 1;
  	char *env;
  
@@ -56,30 +41,24 @@ Index: config.clean/confdata.c
  	dirname[0] = 0;
  	if (name && name[0]) {
  		struct stat st;
-@@ -550,19 +558,31 @@
- 
- int conf_split_config(void)
+@@ -656,6 +657,7 @@
  {
--	char *name, path[128];
-+	const char *name;
-+	char path[128];
+ 	const char *name;
+ 	char path[128];
 +	char *opwd, *dir, *_name;
  	char *s, *d, c;
  	struct symbol *sym;
  	struct stat sb;
- 	int res, i, fd;
- 
--	name = getenv("KCONFIG_AUTOCONFIG");
--	if (!name)
--		name = "include/config/auto.conf";
-+	name = conf_get_autoconfig_name();
+@@ -664,8 +666,20 @@
+ 	name = conf_get_autoconfig_name();
  	conf_read_simple(name, S_DEF_AUTO);
  
 -	if (chdir("include/config"))
+-		return 1;
 +	opwd = malloc(256);
 +	_name = strdup(name);
 +	if (opwd == NULL || _name == NULL)
- 		return 1;
++ 		return 1;
 +	opwd = getcwd(opwd, 256);
 +	dir = dirname(_name);
 +	if (dir == NULL) {
@@ -93,7 +72,7 @@ Index: config.clean/confdata.c
  
  	res = 0;
  	for_all_symbols(i, sym) {
-@@ -655,9 +675,11 @@
+@@ -758,9 +772,11 @@
  		close(fd);
  	}
  out:
@@ -108,15 +87,10 @@ Index: config.clean/confdata.c
  	return res;
  }
  
-@@ -665,23 +687,35 @@
- {
- 	struct symbol *sym;
- 	const char *str;
--	char *name;
-+	const char *name;
- 	FILE *out, *out_h;
+@@ -772,25 +788,38 @@
+ 	FILE *out, *tristate, *out_h;
  	time_t now;
- 	int i, l;
+ 	int i;
 +	char dir[PATH_MAX+1], buf[PATH_MAX+1];
 +	char *s;
 +
@@ -142,13 +116,21 @@ Index: config.clean/confdata.c
  	if (!out)
  		return 1;
  
+-	tristate = fopen(".tmpconfig_tristate", "w");
++	sprintf(buf, "%s.tmpconfig_tristate", dir);
++	tristate = fopen(buf, "w");
+ 	if (!tristate) {
+ 		fclose(out);
+ 		return 1;
+ 	}
+ 
 -	out_h = fopen(".tmpconfig.h", "w");
 +	sprintf(buf, "%s.tmpconfig.h", dir);
 +	out_h = fopen(buf, "w");
  	if (!out_h) {
  		fclose(out);
- 		return 1;
-@@ -698,8 +732,7 @@
+ 		fclose(tristate);
+@@ -811,8 +840,7 @@
  	fprintf(out_h, "/*\n"
  		       " * Automatically generated C config: don't edit\n"
  		       " * %s"
@@ -158,18 +140,22 @@ Index: config.clean/confdata.c
  		       ctime(&now));
  
  	for_all_symbols(i, sym) {
-@@ -764,16 +797,16 @@
+@@ -866,19 +894,22 @@
  	name = getenv("KCONFIG_AUTOHEADER");
  	if (!name)
- 		name = "include/linux/autoconf.h";
+ 		name = "include/generated/autoconf.h";
 -	if (rename(".tmpconfig.h", name))
 +	sprintf(buf, "%s.tmpconfig.h", dir);
 +	if (rename(buf, name))
  		return 1;
--	name = getenv("KCONFIG_AUTOCONFIG");
--	if (!name)
--		name = "include/config/auto.conf";
-+	name = conf_get_autoconfig_name();
+ 	name = getenv("KCONFIG_TRISTATE");
+ 	if (!name)
+ 		name = "include/config/tristate.conf";
+-	if (rename(".tmpconfig_tristate", name))
++	sprintf(buf, "%s.tmpconfig_tristate", dir);
++	if (rename(buf, name))
+ 		return 1;
+ 	name = conf_get_autoconfig_name();
  	/*
  	 * This must be the last step, kbuild has a dependency on auto.conf
  	 * and this marks the successful completion of the previous steps.
@@ -180,22 +166,10 @@ Index: config.clean/confdata.c
  		return 1;
  
  	return 0;
-Index: config.clean/lkc.h
+Index: config/util.c
 ===================================================================
---- config.clean.orig/lkc.h
-+++ config.clean/lkc.h
-@@ -74,6 +74,7 @@
- 
- /* confdata.c */
- const char *conf_get_configname(void);
-+const char *conf_get_autoconfig_name(void);
- char *conf_get_default_confname(void);
- void sym_set_change_count(int count);
- void sym_add_change_count(int count);
-Index: config.clean/util.c
-===================================================================
---- config.clean.orig/util.c
-+++ config.clean/util.c
+--- config.orig/util.c
++++ config/util.c
 @@ -144,6 +144,8 @@
  /* write a dependency file as used by kbuild to track dependencies */
  int file_write_dep(const char *name)
@@ -223,25 +197,7 @@ Index: config.clean/util.c
  	if (!out)
  		return 1;
  	fprintf(out, "deps_config := \\\n");
-@@ -161,8 +172,8 @@
- 		else
- 			fprintf(out, "\t%s\n", file->name);
- 	}
--	fprintf(out, "\ninclude/config/auto.conf: \\\n"
--		     "\t$(deps_config)\n\n");
-+	fprintf(out, "\n%s: \\\n"
-+		     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
- 
- 	expr_list_for_each_sym(sym_env_list, e, sym) {
- 		struct property *prop;
-@@ -176,13 +187,14 @@
- 		if (!value)
- 			value = "";
- 		fprintf(out, "ifneq \"$(%s)\" \"%s\"\n", env_sym->name, value);
--		fprintf(out, "include/config/auto.conf: FORCE\n");
-+		fprintf(out, "%s: FORCE\n", conf_get_autoconfig_name());
- 		fprintf(out, "endif\n");
- 	}
+@@ -182,7 +193,8 @@
  
  	fprintf(out, "\n$(deps_config): ;\n");
  	fclose(out);
diff --git a/package/config/patches/15-misc-qconf-changes.patch b/package/config/patches/15-misc-qconf-changes.patch
deleted file mode 100644
index 683d518f1..000000000
--- a/package/config/patches/15-misc-qconf-changes.patch
+++ /dev/null
@@ -1,175 +0,0 @@
----
- qconf.cc |   48 +++++++++++++++++++++++++++---------------------
- 1 file changed, 27 insertions(+), 21 deletions(-)
-
-Index: config.clean/qconf.cc
-===================================================================
---- config.clean.orig/qconf.cc
-+++ config.clean/qconf.cc
-@@ -5,6 +5,7 @@
- 
- #include <qapplication.h>
- #include <qmainwindow.h>
-+#include <qdesktopwidget.h>
- #include <qtoolbar.h>
- #include <qlayout.h>
- #include <qvbox.h>
-@@ -297,10 +298,10 @@
- void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
- {
- 	switch (e->key()) {
--	case Key_Escape:
-+	case Qt::Key_Escape:
- 		break;
--	case Key_Return:
--	case Key_Enter:
-+	case Qt::Key_Return:
-+	case Qt::Key_Enter:
- 		sym_set_string_value(item->menu->sym, text().latin1());
- 		parent()->updateList(item);
- 		break;
-@@ -639,7 +640,7 @@
- 	struct menu *menu;
- 	enum prop_type type;
- 
--	if (ev->key() == Key_Escape && mode != fullMode && mode != listMode) {
-+	if (ev->key() == Qt::Key_Escape && mode != fullMode && mode != listMode) {
- 		emit parentSelected();
- 		ev->accept();
- 		return;
-@@ -652,8 +653,8 @@
- 	item = (ConfigItem*)i;
- 
- 	switch (ev->key()) {
--	case Key_Return:
--	case Key_Enter:
-+	case Qt::Key_Return:
-+	case Qt::Key_Enter:
- 		if (item->goParent) {
- 			emit parentSelected();
- 			break;
-@@ -667,16 +668,16 @@
- 			emit menuSelected(menu);
- 			break;
- 		}
--	case Key_Space:
-+	case Qt::Key_Space:
- 		changeValue(item);
- 		break;
--	case Key_N:
-+	case Qt::Key_N:
- 		setValue(item, no);
- 		break;
--	case Key_M:
-+	case Qt::Key_M:
- 		setValue(item, mod);
- 		break;
--	case Key_Y:
-+	case Qt::Key_Y:
- 		setValue(item, yes);
- 		break;
- 	default:
-@@ -920,7 +921,7 @@
- }
- 
- ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
--	: Parent(parent, name), menu(0), sym(0)
-+	: Parent(parent, name), sym(0), menu(0)
- {
- 	if (name) {
- 		configSettings->beginGroup(name);
-@@ -1199,7 +1200,7 @@
- 	layout1->addLayout(layout2);
- 
- 	split = new QSplitter(this);
--	split->setOrientation(QSplitter::Vertical);
-+	split->setOrientation(Qt::Vertical);
- 	list = new ConfigView(split, name);
- 	list->list->mode = listMode;
- 	info = new ConfigInfoView(split, name);
-@@ -1275,7 +1276,7 @@
- 	int x, y, width, height;
- 	char title[256];
- 
--	QWidget *d = configApp->desktop();
-+	QDesktopWidget *d = configApp->desktop();
- 	snprintf(title, sizeof(title), _("Buildroot Configuration"));
- 	setCaption(title);
- 
-@@ -1289,14 +1290,14 @@
- 		move(x, y);
- 
- 	split1 = new QSplitter(this);
--	split1->setOrientation(QSplitter::Horizontal);
-+	split1->setOrientation(Qt::Horizontal);
- 	setCentralWidget(split1);
- 
- 	menuView = new ConfigView(split1, "menu");
- 	menuList = menuView->list;
- 
- 	split2 = new QSplitter(split1);
--	split2->setOrientation(QSplitter::Vertical);
-+	split2->setOrientation(Qt::Vertical);
- 
- 	// create config tree
- 	configView = new ConfigView(split2, "config");
-@@ -1314,18 +1315,18 @@
- 	backAction = new QAction("Back", QPixmap(xpm_back), _("Back"), 0, this);
- 	  connect(backAction, SIGNAL(activated()), SLOT(goBack()));
- 	  backAction->setEnabled(FALSE);
--	QAction *quitAction = new QAction("Quit", _("&Quit"), CTRL+Key_Q, this);
-+	QAction *quitAction = new QAction("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
- 	  connect(quitAction, SIGNAL(activated()), SLOT(close()));
--	QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), CTRL+Key_L, this);
-+	QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
- 	  connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
--	saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), CTRL+Key_S, this);
-+	saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
- 	  connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
- 	conf_set_changed_callback(conf_changed);
- 	// Set saveAction's initial state
- 	conf_changed();
- 	QAction *saveAsAction = new QAction("Save As...", _("Save &As..."), 0, this);
- 	  connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
--	QAction *searchAction = new QAction("Find", _("&Find"), CTRL+Key_F, this);
-+	QAction *searchAction = new QAction("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
- 	  connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
- 	QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
- 	  connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
-@@ -1446,7 +1447,7 @@
- 
- void ConfigMainWindow::loadConfig(void)
- {
--	QString s = QFileDialog::getOpenFileName(".config", NULL, this);
-+	QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this);
- 	if (s.isNull())
- 		return;
- 	if (conf_read(QFile::encodeName(s)))
-@@ -1462,7 +1463,7 @@
- 
- void ConfigMainWindow::saveConfigAs(void)
- {
--	QString s = QFileDialog::getSaveFileName(".config", NULL, this);
-+	QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this);
- 	if (s.isNull())
- 		return;
- 	if (conf_write(QFile::encodeName(s)))
-@@ -1523,6 +1524,8 @@
- 	case fullMode:
- 		list = configList;
- 		break;
-+	default:
-+		break;
- 	}
- 
- 	if (list) {
-@@ -1674,6 +1677,9 @@
- 	case fullMode :
- 		entry = "full";
- 		break;
-+
-+	default:
-+		break;
- 	}
- 	configSettings->writeEntry("/listMode", entry);
- 
diff --git a/package/config/patches/16-non-identified-changes.patch b/package/config/patches/16-non-identified-changes.patch
deleted file mode 100644
index 3a4bae5d9..000000000
--- a/package/config/patches/16-non-identified-changes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
----
- lxdialog/checklist.c |    3 ++-
- mconf.c              |   10 +++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-Index: config.clean/lxdialog/checklist.c
-===================================================================
---- config.clean.orig/lxdialog/checklist.c
-+++ config.clean/lxdialog/checklist.c
-@@ -41,7 +41,8 @@
- 	wmove(win, choice, check_x);
- 	wattrset(win, selected ? dlg.check_selected.atr
- 		 : dlg.check.atr);
--	wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
-+	if (!item_is_tag(':'))
-+		wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
- 
- 	wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
- 	mvwaddch(win, choice, item_x, item_str()[0]);
-Index: config.clean/mconf.c
-===================================================================
---- config.clean.orig/mconf.c
-+++ config.clean/mconf.c
-@@ -731,7 +731,12 @@
- 		for (child = menu->list; child; child = child->next) {
- 			if (!menu_is_visible(child))
- 				continue;
--			item_make("%s", _(menu_get_prompt(child)));
-+			if (child->sym)
-+				item_make("%s", _(menu_get_prompt(child)));
-+			else {
-+				item_make("*** %s ***", _(menu_get_prompt(child)));
-+				item_set_tag(':');
-+			}
- 			item_set_data(child);
- 			if (child->sym == active)
- 				item_set_selected(1);
-@@ -747,6 +752,9 @@
- 		case 0:
- 			if (selected) {
- 				child = item_data();
-+				if (!child->sym)
-+					break;
-+
- 				sym_set_tristate_value(child->sym, yes);
- 			}
- 			return;
diff --git a/package/config/patches/series b/package/config/patches/series
index d5ab94c7f..997befd35 100644
--- a/package/config/patches/series
+++ b/package/config/patches/series
@@ -1,10 +1,8 @@
 01-kconfig-kernel-to-buildroot.patch
 02-cpp-comments-to-c-comments.patch
 03-change-config-option-prefix.patch
-04-fedora-13-build-fix.patch
 05-really-clean-everything.patch
 06-br-build-system-integration.patch
-07-minor-makefile-fixes.patch
 08-make-write-deps.patch
 09-implement-kconfig-probability.patch
 10-br-build-system.patch
@@ -12,5 +10,3 @@
 12-fix-glade-file-path.patch
 13-use-conf-write-autoconf.patch
 14-support-out-of-tree-config.patch
-15-misc-qconf-changes.patch
-16-non-identified-changes.patch