diff options
Diffstat (limited to 'support/kconfig/patches')
6 files changed, 20 insertions, 65 deletions
diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch index d7206a0040..25b436b7a2 100644 --- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch @@ -25,7 +25,7 @@ Index: b/mconf.c +++ b/mconf.c @@ -178,9 +178,9 @@ "Arrow keys navigate the menu. " - "<Enter> selects submenus --->. " + "<Enter> selects submenus ---> (or empty submenus ----). " "Highlighted letters are hotkeys. " - "Pressing <Y> includes, <N> excludes, <M> modularizes features. " + "Pressing <Y> selectes a feature, while <N> will exclude a feature. " @@ -39,10 +39,10 @@ Index: b/zconf.tab.c_shipped =================================================================== --- a/zconf.tab.c_shipped +++ b/zconf.tab.c_shipped -@@ -2259,7 +2259,7 @@ - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; +@@ -2297,7 +2297,7 @@ + + sym_init(); + _menu_init(); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL); @@ -52,10 +52,10 @@ Index: b/zconf.y =================================================================== --- a/zconf.y +++ b/zconf.y -@@ -496,7 +496,7 @@ - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; +@@ -493,7 +493,7 @@ + + sym_init(); + _menu_init(); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL); @@ -65,7 +65,7 @@ Index: b/confdata.c =================================================================== --- a/confdata.c +++ b/confdata.c -@@ -25,7 +26,7 @@ +@@ -25,7 +25,7 @@ static const char *conf_filename; static int conf_lineno, conf_warnings, conf_unsaved; @@ -74,7 +74,7 @@ Index: b/confdata.c static void conf_warning(const char *fmt, ...) { -@@ -63,7 +64,7 @@ +@@ -63,7 +63,7 @@ const char *conf_get_configname(void) { diff --git a/support/kconfig/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch deleted file mode 100644 index 45fa2513a1..0000000000 --- a/support/kconfig/patches/09-implement-kconfig-probability.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- - confdata.c | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -Index: b/confdata.c -=================================================================== ---- a/confdata.c -+++ b/confdata.c -@@ -1106,7 +1106,16 @@ - void conf_set_all_new_symbols(enum conf_def_mode mode) - { - struct symbol *sym, *csym; -- int i, cnt; -+ int i, cnt, prob = 50; -+ -+ if (mode == def_random) { -+ char *endp, *env = getenv("KCONFIG_PROBABILITY"); -+ if (env && *env) { -+ int tmp = (int)strtol(env, &endp, 10); -+ if (*endp == '\0' && tmp >= 0 && tmp <= 100) -+ prob = tmp; -+ } -+ } - - for_all_symbols(i, sym) { - if (sym_has_value(sym)) -@@ -1125,8 +1134,15 @@ - sym->def[S_DEF_USER].tri = no; - break; - case def_random: -- 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; -+ else -+ if ((sym_get_type(sym) == S_TRISTATE) -+ && (cnt > prob/2)) -+ sym->def[S_DEF_USER].tri = mod; -+ else -+ sym->def[S_DEF_USER].tri = yes; - break; - default: - continue; diff --git a/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch index 1e0c80396a..b38af26211 100644 --- a/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch +++ b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch @@ -6,7 +6,7 @@ Index: b/lxdialog/check-lxdialog.sh =================================================================== --- a/lxdialog/check-lxdialog.sh +++ b/lxdialog/check-lxdialog.sh -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ } # Temp file, try to clean up after us diff --git a/support/kconfig/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch index e764fb26b7..ec3134f94e 100644 --- a/support/kconfig/patches/14-support-out-of-tree-config.patch +++ b/support/kconfig/patches/14-support-out-of-tree-config.patch @@ -8,7 +8,7 @@ Index: b/conf.c =================================================================== --- a/conf.c +++ b/conf.c -@@ -547,7 +547,6 @@ +@@ -558,7 +558,6 @@ } name = av[optind]; conf_parse(name); @@ -39,7 +39,7 @@ Index: b/confdata.c } static char *conf_expand_value(const char *in) -@@ -737,6 +736,9 @@ +@@ -742,6 +741,9 @@ char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; char *env; @@ -49,7 +49,7 @@ Index: b/confdata.c dirname[0] = 0; if (name && name[0]) { struct stat st; -@@ -831,6 +833,7 @@ +@@ -836,6 +838,7 @@ { const char *name; char path[PATH_MAX+1]; @@ -57,7 +57,7 @@ Index: b/confdata.c char *s, *d, c; struct symbol *sym; struct stat sb; -@@ -839,8 +842,20 @@ +@@ -844,8 +847,20 @@ name = conf_get_autoconfig_name(); conf_read_simple(name, S_DEF_AUTO); @@ -80,7 +80,7 @@ Index: b/confdata.c res = 0; for_all_symbols(i, sym) { -@@ -933,9 +948,11 @@ +@@ -938,9 +953,11 @@ close(fd); } out: @@ -95,7 +95,7 @@ Index: b/confdata.c return res; } -@@ -945,25 +962,38 @@ +@@ -950,25 +967,38 @@ const char *name; FILE *out, *tristate, *out_h; int i; @@ -138,7 +138,7 @@ Index: b/confdata.c if (!out_h) { fclose(out); fclose(tristate); -@@ -995,19 +1025,22 @@ +@@ -1000,19 +1030,22 @@ name = getenv("KCONFIG_AUTOHEADER"); if (!name) name = "include/generated/autoconf.h"; diff --git a/support/kconfig/patches/15-fix-qconf-moc-rule.patch b/support/kconfig/patches/15-fix-qconf-moc-rule.patch index eae978ebf1..c1848d764e 100644 --- a/support/kconfig/patches/15-fix-qconf-moc-rule.patch +++ b/support/kconfig/patches/15-fix-qconf-moc-rule.patch @@ -9,7 +9,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -307,11 +307,8 @@ +@@ -309,11 +309,8 @@ $(obj)/qconf.o: $(obj)/qconf.moc diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series index a3e98435f8..9154d83727 100644 --- a/support/kconfig/patches/series +++ b/support/kconfig/patches/series @@ -1,6 +1,5 @@ 01-kconfig-kernel-to-buildroot.patch 06-br-build-system-integration.patch -09-implement-kconfig-probability.patch 10-br-build-system.patch 11-use-mktemp-for-lxdialog.patch 12-fix-glade-file-path.patch |
