From 72daa122b6a4a9562109299d0b747c71aac1e483 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 2 Feb 2011 11:48:58 +0100 Subject: package/config: rebase against 2.6.37-rc1 Signed-off-by: Peter Korsgaard --- .../patches/01-kconfig-kernel-to-buildroot.patch | 258 +-------------------- .../patches/03-change-config-option-prefix.patch | 140 ++++++----- .../patches/05-really-clean-everything.patch | 2 +- .../patches/06-br-build-system-integration.patch | 2 +- package/config/patches/08-make-write-deps.patch | 4 +- .../patches/09-implement-kconfig-probability.patch | 4 +- .../patches/11-use-mktemp-for-lxdialog.patch | 2 +- .../config/patches/12-fix-glade-file-path.patch | 2 +- .../patches/14-support-out-of-tree-config.patch | 28 +-- .../patches/15-use-PATH_MAX-for-path-buffer.patch | 38 --- package/config/patches/series | 1 - 11 files changed, 115 insertions(+), 366 deletions(-) delete mode 100644 package/config/patches/15-use-PATH_MAX-for-path-buffer.patch (limited to 'package/config/patches') 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 @@ True @@ -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. " " 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" - " 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; diff --git a/package/config/patches/03-change-config-option-prefix.patch b/package/config/patches/03-change-config-option-prefix.patch index 9e93f682c..707dcf4ce 100644 --- a/package/config/patches/03-change-config-option-prefix.patch +++ b/package/config/patches/03-change-config-option-prefix.patch @@ -1,12 +1,14 @@ --- - confdata.c | 49 +++++++++++++++++++++++-------------------------- - 1 file changed, 23 insertions(+), 26 deletions(-) + confdata.c | 57 +++++++++++++++++++++++++++++---------------------------- + lkc.h | 2 +- + menu.c | 2 +- + 3 files changed, 31 insertions(+), 30 deletions(-) Index: config/confdata.c =================================================================== --- config.orig/confdata.c +++ config/confdata.c -@@ -11,6 +11,7 @@ +@@ -12,6 +12,7 @@ #include #include #include @@ -14,7 +16,7 @@ Index: config/confdata.c #define LKC_DIRECT_LINK #include "lkc.h" -@@ -21,7 +22,7 @@ +@@ -25,7 +26,7 @@ static const char *conf_filename; static int conf_lineno, conf_warnings, conf_unsaved; @@ -23,7 +25,7 @@ Index: config/confdata.c static void conf_warning(const char *fmt, ...) { -@@ -36,7 +37,7 @@ +@@ -63,7 +64,7 @@ const char *conf_get_configname(void) { @@ -32,14 +34,11 @@ Index: config/confdata.c return name ? name : ".config"; } -@@ -222,22 +223,22 @@ - sym = NULL; - switch (line[0]) { - case '#': -- if (memcmp(line + 2, "CONFIG_", 7)) -+ if (line[1]!=' ') +@@ -249,20 +250,20 @@ + if (line[0] == '#') { + if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) continue; -- p = strchr(line + 9, ' '); +- p = strchr(line + 2 + strlen(CONFIG_), ' '); + p = strchr(line + 2, ' '); if (!p) continue; @@ -47,118 +46,153 @@ Index: config/confdata.c if (strncmp(p, "is not set", 10)) continue; if (def == S_DEF_USER) { -- sym = sym_find(line + 9); +- sym = sym_find(line + 2 + strlen(CONFIG_)); + sym = sym_find(line + 2); if (!sym) { sym_add_change_count(1); - break; + goto setsym; } } else { -- sym = sym_lookup(line + 9, 0); +- sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); + sym = sym_lookup(line + 2, 0); if (sym->type == S_UNKNOWN) sym->type = S_BOOLEAN; } -@@ -254,12 +255,8 @@ +@@ -278,8 +279,8 @@ + default: ; } - break; -- case 'C': -- if (memcmp(line, "CONFIG_", 7)) { -- conf_warning("unexpected data"); -- continue; -- } -- p = strchr(line + 7, '='); -+ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z': +- } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { +- p = strchr(line + strlen(CONFIG_), '='); ++ } else if (isupper(line[0])) { + p = strchr(line, '='); if (!p) continue; *p++ = 0; -@@ -270,13 +267,13 @@ +@@ -290,13 +291,13 @@ *p2 = 0; } if (def == S_DEF_USER) { -- sym = sym_find(line + 7); +- sym = sym_find(line + strlen(CONFIG_)); + sym = sym_find(line); if (!sym) { sym_add_change_count(1); - break; + goto setsym; } } else { -- sym = sym_lookup(line + 7, 0); +- sym = sym_lookup(line + strlen(CONFIG_), 0); + sym = sym_lookup(line, 0); if (sym->type == S_UNKNOWN) sym->type = S_OTHER; } -@@ -405,9 +402,9 @@ +@@ -423,9 +424,9 @@ { int l; if (headerfile) -- fprintf(out, "#define CONFIG_%s \"", name); +- fprintf(out, "#define %s%s \"", CONFIG_, name); + fprintf(out, "#define %s \"", name); else -- fprintf(out, "CONFIG_%s=\"", name); +- fprintf(out, "%s%s=\"", CONFIG_, name); + fprintf(out, "%s=\"", name); while (1) { l = strcspn(str, "\"\\"); -@@ -433,13 +430,13 @@ +@@ -451,14 +452,14 @@ 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); +- fprintf(out, "# %s%s is not set\n", +- CONFIG_, 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%s=m\n", CONFIG_, sym->name); + fprintf(out, "%s=m\n", sym->name); break; case yes: -- fprintf(out, "CONFIG_%s=y\n", sym->name); +- fprintf(out, "%s%s=y\n", CONFIG_, sym->name); + fprintf(out, "%s=y\n", sym->name); break; } break; -@@ -449,7 +446,7 @@ +@@ -468,7 +469,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=%s\n", CONFIG_, sym->name, str); + fprintf(out, "%s=%s\n", sym->name, str); break; case S_OTHER: case S_UNKNOWN: -@@ -840,14 +837,14 @@ +@@ -853,17 +854,17 @@ case no: break; case mod: -- fprintf(tristate, "CONFIG_%s=M\n", sym->name); -- fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name); -+ fprintf(tristate, "%s=M\n", sym->name); -+ fprintf(out_h, "#define %s_MODULE 1\n", sym->name); +- fprintf(tristate, "%s%s=M\n", +- CONFIG_, sym->name); +- fprintf(out_h, "#define %s%s_MODULE 1\n", +- CONFIG_, sym->name); ++ fprintf(tristate, "%s=M\n", ++ sym->name); ++ fprintf(out_h, "#define %s_MODULE 1\n", ++ sym->name); break; case yes: 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_h, "#define %s 1\n", sym->name); +- fprintf(tristate,"%s%s=Y\n", +- CONFIG_, sym->name); +- fprintf(out_h, "#define %s%s 1\n", +- CONFIG_, sym->name); ++ fprintf(tristate,"%s=Y\n", ++ sym->name); ++ fprintf(out_h, "#define %s 1\n", ++ sym->name); break; } break; -@@ -857,12 +854,12 @@ +@@ -873,14 +874,14 @@ case S_HEX: str = sym_get_string_value(sym); if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { -- fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str); -+ fprintf(out_h, "#define %s 0x%s\n", sym->name, str); +- fprintf(out_h, "#define %s%s 0x%s\n", +- CONFIG_, 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_h, "#define CONFIG_%s %s\n", sym->name, str); -+ fprintf(out_h, "#define %s %s\n", sym->name, str); +- fprintf(out_h, "#define %s%s %s\n", +- CONFIG_, sym->name, str); ++ fprintf(out_h, "#define %s %s\n", ++ sym->name, str); break; default: break; +Index: config/lkc.h +=================================================================== +--- config.orig/lkc.h ++++ config/lkc.h +@@ -41,7 +41,7 @@ + #define N_(text) (text) + + #ifndef CONFIG_ +-#define CONFIG_ "CONFIG_" ++#define CONFIG_ "BR2_" + #endif + + #define TF_COMMAND 0x0001 +Index: config/menu.c +=================================================================== +--- config.orig/menu.c ++++ config/menu.c +@@ -563,7 +563,7 @@ + + if (menu_has_help(menu)) { + if (sym->name) { +- str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); ++ str_printf(help, "%s:\n\n", sym->name); + str_append(help, _(menu_get_help(menu))); + str_append(help, "\n"); + } diff --git a/package/config/patches/05-really-clean-everything.patch b/package/config/patches/05-really-clean-everything.patch index 50575e472..a1517542e 100644 --- a/package/config/patches/05-really-clean-everything.patch +++ b/package/config/patches/05-really-clean-everything.patch @@ -6,7 +6,7 @@ Index: config/Makefile =================================================================== --- config.orig/Makefile +++ config/Makefile -@@ -199,10 +199,16 @@ +@@ -196,10 +196,16 @@ gconf-objs := gconf.o kconfig_load.o zconf.tab.o endif diff --git a/package/config/patches/06-br-build-system-integration.patch b/package/config/patches/06-br-build-system-integration.patch index 128bbc02c..8a27e251e 100644 --- a/package/config/patches/06-br-build-system-integration.patch +++ b/package/config/patches/06-br-build-system-integration.patch @@ -6,7 +6,7 @@ Index: config/Makefile =================================================================== --- config.orig/Makefile +++ config/Makefile -@@ -177,18 +177,30 @@ +@@ -174,18 +174,30 @@ ifeq ($(MAKECMDGOALS),nconfig) hostprogs-y += nconf endif diff --git a/package/config/patches/08-make-write-deps.patch b/package/config/patches/08-make-write-deps.patch index 686038a5b..0f9c7e308 100644 --- a/package/config/patches/08-make-write-deps.patch +++ b/package/config/patches/08-make-write-deps.patch @@ -6,7 +6,7 @@ Index: config/util.c =================================================================== --- config.orig/util.c +++ config/util.c -@@ -26,6 +26,121 @@ +@@ -29,6 +29,121 @@ return file; } @@ -128,7 +128,7 @@ Index: config/util.c /* write a dependency file as used by kbuild to track dependencies */ int file_write_dep(const char *name) { -@@ -68,7 +183,7 @@ +@@ -71,7 +186,7 @@ fprintf(out, "\n$(deps_config): ;\n"); fclose(out); rename("..config.tmp", name); diff --git a/package/config/patches/09-implement-kconfig-probability.patch b/package/config/patches/09-implement-kconfig-probability.patch index 622093107..8ee5ea36c 100644 --- a/package/config/patches/09-implement-kconfig-probability.patch +++ b/package/config/patches/09-implement-kconfig-probability.patch @@ -6,7 +6,7 @@ Index: config/confdata.c =================================================================== --- config.orig/confdata.c +++ config/confdata.c -@@ -983,7 +983,16 @@ +@@ -1005,7 +1005,16 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) { struct symbol *sym, *csym; @@ -24,7 +24,7 @@ Index: config/confdata.c for_all_symbols(i, sym) { if (sym_has_value(sym)) -@@ -1002,8 +1011,15 @@ +@@ -1024,8 +1033,15 @@ sym->def[S_DEF_USER].tri = no; break; case def_random: diff --git a/package/config/patches/11-use-mktemp-for-lxdialog.patch b/package/config/patches/11-use-mktemp-for-lxdialog.patch index 60190b877..21ca22883 100644 --- a/package/config/patches/11-use-mktemp-for-lxdialog.patch +++ b/package/config/patches/11-use-mktemp-for-lxdialog.patch @@ -6,7 +6,7 @@ Index: config/lxdialog/check-lxdialog.sh =================================================================== --- config.orig/lxdialog/check-lxdialog.sh +++ config/lxdialog/check-lxdialog.sh -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ } # Temp file, try to clean up after us diff --git a/package/config/patches/12-fix-glade-file-path.patch b/package/config/patches/12-fix-glade-file-path.patch index 140201cec..5b080c94b 100644 --- a/package/config/patches/12-fix-glade-file-path.patch +++ b/package/config/patches/12-fix-glade-file-path.patch @@ -6,7 +6,7 @@ Index: config/gconf.c =================================================================== --- config.orig/gconf.c +++ config/gconf.c -@@ -1525,7 +1525,7 @@ +@@ -1521,7 +1521,7 @@ /* Determine GUI path */ env = getenv(SRCTREE); if (env) 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 763e063c6..54d0bd99c 100644 --- a/package/config/patches/14-support-out-of-tree-config.patch +++ b/package/config/patches/14-support-out-of-tree-config.patch @@ -20,7 +20,7 @@ Index: config/confdata.c =================================================================== --- config.orig/confdata.c +++ config/confdata.c -@@ -44,9 +44,7 @@ +@@ -71,9 +71,7 @@ const char *conf_get_autoconfig_name(void) { @@ -31,7 +31,7 @@ Index: config/confdata.c } static char *conf_expand_value(const char *in) -@@ -544,6 +542,9 @@ +@@ -567,6 +565,9 @@ int use_timestamp = 1; char *env; @@ -41,15 +41,15 @@ Index: config/confdata.c dirname[0] = 0; if (name && name[0]) { struct stat st; -@@ -660,6 +661,7 @@ +@@ -679,6 +680,7 @@ { const char *name; - char path[128]; + char path[PATH_MAX+1]; + char *opwd, *dir, *_name; char *s, *d, c; struct symbol *sym; struct stat sb; -@@ -668,8 +670,20 @@ +@@ -687,8 +689,20 @@ name = conf_get_autoconfig_name(); conf_read_simple(name, S_DEF_AUTO); @@ -72,7 +72,7 @@ Index: config/confdata.c res = 0; for_all_symbols(i, sym) { -@@ -762,9 +776,11 @@ +@@ -781,9 +795,11 @@ close(fd); } out: @@ -87,7 +87,7 @@ Index: config/confdata.c return res; } -@@ -776,25 +792,38 @@ +@@ -795,25 +811,38 @@ FILE *out, *tristate, *out_h; time_t now; int i; @@ -130,17 +130,17 @@ Index: config/confdata.c if (!out_h) { fclose(out); fclose(tristate); -@@ -817,8 +846,7 @@ - fprintf(out_h, "/*\n" +@@ -834,8 +863,7 @@ " * Automatically generated C config: don't edit\n" + " * %s\n" " * %s" - " */\n" - "#define AUTOCONF_INCLUDED\n", + " */\n", - ctime(&now)); + rootmenu.prompt->text, ctime(&now)); for_all_symbols(i, sym) { -@@ -872,19 +900,22 @@ +@@ -894,19 +922,22 @@ name = getenv("KCONFIG_AUTOHEADER"); if (!name) name = "include/generated/autoconf.h"; @@ -170,7 +170,7 @@ Index: config/util.c =================================================================== --- config.orig/util.c +++ config/util.c -@@ -144,6 +144,8 @@ +@@ -147,6 +147,8 @@ /* write a dependency file as used by kbuild to track dependencies */ int file_write_dep(const char *name) { @@ -179,7 +179,7 @@ Index: config/util.c struct symbol *sym, *env_sym; struct expr *e; struct file *file; -@@ -151,7 +153,16 @@ +@@ -154,7 +156,16 @@ if (!name) name = ".kconfig.d"; @@ -197,7 +197,7 @@ Index: config/util.c if (!out) return 1; fprintf(out, "deps_config := \\\n"); -@@ -182,7 +193,8 @@ +@@ -185,7 +196,8 @@ fprintf(out, "\n$(deps_config): ;\n"); fclose(out); diff --git a/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch b/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch deleted file mode 100644 index 816aa446a..000000000 --- a/package/config/patches/15-use-PATH_MAX-for-path-buffer.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b Mon Sep 17 00:00:00 2001 -From: Will Newton -Date: Wed, 22 Sep 2010 15:59:13 +0100 -Subject: [PATCH] kconfig: Use PATH_MAX instead of 128 for path buffer sizes. - -This prevents the buffers being overflowed when using a config -file with a long name. PATH_MAX is used elsewhere in the same -file, so use it here as well. - -Signed-off-by: Will Newton -Acked-by: WANG Cong -Signed-off-by: Michal Marek ---- - confdata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: config/confdata.c -=================================================================== ---- config.orig/confdata.c -+++ config/confdata.c -@@ -536,7 +536,7 @@ - struct menu *menu; - const char *basename; - const char *str; -- char dirname[128], tmpname[128], newname[128]; -+ char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; - enum symbol_type type; - time_t now; - int use_timestamp = 1; -@@ -660,7 +660,7 @@ - static int conf_split_config(void) - { - const char *name; -- char path[128]; -+ char path[PATH_MAX+1]; - char *opwd, *dir, *_name; - char *s, *d, c; - struct symbol *sym; diff --git a/package/config/patches/series b/package/config/patches/series index 098b082ca..defdf5899 100644 --- a/package/config/patches/series +++ b/package/config/patches/series @@ -9,4 +9,3 @@ 11-use-mktemp-for-lxdialog.patch 12-fix-glade-file-path.patch 14-support-out-of-tree-config.patch -15-use-PATH_MAX-for-path-buffer.patch -- cgit v1.2.3