diff options
Diffstat (limited to 'package/config/patches')
3 files changed, 16 insertions, 26 deletions
diff --git a/package/config/patches/03-change-config-option-prefix.patch b/package/config/patches/03-change-config-option-prefix.patch index 8476ea484..d387236e7 100644 --- a/package/config/patches/03-change-config-option-prefix.patch +++ b/package/config/patches/03-change-config-option-prefix.patch @@ -97,7 +97,7 @@ Index: config/confdata.c while (1) { l = strcspn(str, "\"\\"); -@@ -451,14 +452,14 @@ +@@ -450,14 +451,14 @@ switch (sym_get_tristate_value(sym)) { case no: if (write_no) @@ -116,7 +116,7 @@ Index: config/confdata.c break; } break; -@@ -468,7 +469,7 @@ +@@ -467,7 +468,7 @@ case S_HEX: case S_INT: str = sym_get_string_value(sym); @@ -125,7 +125,7 @@ Index: config/confdata.c break; case S_OTHER: case S_UNKNOWN: -@@ -853,17 +854,17 @@ +@@ -844,17 +845,17 @@ case no: break; case mod: @@ -151,7 +151,7 @@ Index: config/confdata.c break; } break; -@@ -873,14 +874,14 @@ +@@ -864,14 +865,14 @@ case S_HEX: str = sym_get_string_value(sym); if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { @@ -174,7 +174,7 @@ Index: config/lkc.h =================================================================== --- config.orig/lkc.h +++ config/lkc.h -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #define N_(text) (text) #ifndef CONFIG_ @@ -187,7 +187,7 @@ Index: config/menu.c =================================================================== --- config.orig/menu.c +++ config/menu.c -@@ -588,7 +588,7 @@ +@@ -597,7 +597,7 @@ if (menu_has_help(menu)) { if (sym->name) { diff --git a/package/config/patches/09-implement-kconfig-probability.patch b/package/config/patches/09-implement-kconfig-probability.patch index 8ee5ea36c..3f09673b8 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 -@@ -1005,7 +1005,16 @@ +@@ -996,7 +996,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)) -@@ -1024,8 +1033,15 @@ +@@ -1015,8 +1024,15 @@ sym->def[S_DEF_USER].tri = no; break; case def_random: 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 54d0bd99c..9fa6384d3 100644 --- a/package/config/patches/14-support-out-of-tree-config.patch +++ b/package/config/patches/14-support-out-of-tree-config.patch @@ -1,8 +1,8 @@ --- conf.c | 1 - confdata.c | 65 +++++++++++++++++++++++++++++++++++++++++++++---------------- + confdata.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++--------------- util.c | 16 +++++++++++++-- - 3 files changed, 62 insertions(+), 20 deletions(-) + 3 files changed, 61 insertions(+), 18 deletions(-) Index: config/conf.c =================================================================== @@ -31,7 +31,7 @@ Index: config/confdata.c } static char *conf_expand_value(const char *in) -@@ -567,6 +565,9 @@ +@@ -565,6 +563,9 @@ int use_timestamp = 1; char *env; @@ -41,7 +41,7 @@ Index: config/confdata.c dirname[0] = 0; if (name && name[0]) { struct stat st; -@@ -679,6 +680,7 @@ +@@ -671,6 +672,7 @@ { const char *name; char path[PATH_MAX+1]; @@ -49,7 +49,7 @@ Index: config/confdata.c char *s, *d, c; struct symbol *sym; struct stat sb; -@@ -687,8 +689,20 @@ +@@ -679,8 +681,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) { -@@ -781,9 +795,11 @@ +@@ -773,9 +787,11 @@ close(fd); } out: @@ -87,7 +87,7 @@ Index: config/confdata.c return res; } -@@ -795,25 +811,38 @@ +@@ -787,25 +803,38 @@ FILE *out, *tristate, *out_h; time_t now; int i; @@ -130,17 +130,7 @@ Index: config/confdata.c if (!out_h) { fclose(out); fclose(tristate); -@@ -834,8 +863,7 @@ - " * Automatically generated C config: don't edit\n" - " * %s\n" - " * %s" -- " */\n" -- "#define AUTOCONF_INCLUDED\n", -+ " */\n", - rootmenu.prompt->text, ctime(&now)); - - for_all_symbols(i, sym) { -@@ -894,19 +922,22 @@ +@@ -885,19 +914,22 @@ name = getenv("KCONFIG_AUTOHEADER"); if (!name) name = "include/generated/autoconf.h"; |