diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.29.1/linux-2.6-build-nonintconfig.patch')
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.29.1/linux-2.6-build-nonintconfig.patch | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.29.1/linux-2.6-build-nonintconfig.patch b/meta-moblin/packages/linux/linux-moblin-2.6.29.1/linux-2.6-build-nonintconfig.patch deleted file mode 100644 index bd65daf..0000000 --- a/meta-moblin/packages/linux/linux-moblin-2.6.29.1/linux-2.6-build-nonintconfig.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile -index 32e8c5a..8020453 100644 ---- a/scripts/kconfig/Makefile -+++ b/scripts/kconfig/Makefile -@@ -24,6 +24,11 @@ oldconfig: $(obj)/conf - silentoldconfig: $(obj)/conf - $< -s $(Kconfig) - -+nonint_oldconfig: $(obj)/conf -+ $< -b $(Kconfig) -+loose_nonint_oldconfig: $(obj)/conf -+ $< -B $(Kconfig) -+ - # Create new linux.pot file - # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files - # The symlink is used to repair a deficiency in arch/um -diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c -index fda6313..ed33b66 100644 ---- a/scripts/kconfig/conf.c -+++ b/scripts/kconfig/conf.c -@@ -22,6 +22,8 @@ - ask_all, - ask_new, - ask_silent, -+ dont_ask, -+ dont_ask_dont_tell, - set_default, - set_yes, - set_mod, -@@ -39,6 +41,8 @@ - - static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"); - -+static int return_value = 0; -+ - static const char *get_help(struct menu *menu) - { - if (menu_has_help(menu)) -@@ -359,7 +363,10 @@ - - switch (prop->type) { - case P_MENU: -- if (input_mode == ask_silent && rootEntry != menu) { -+ if ((input_mode == ask_silent || -+ input_mode == dont_ask || -+ input_mode == dont_ask_dont_tell) && -+ rootEntry != menu) { - check_conf(menu); - return; - } -@@ -417,12 +424,21 @@ - if (sym && !sym_has_value(sym)) { - if (sym_is_changable(sym) || - (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { -+ if (input_mode == dont_ask || -+ input_mode == dont_ask_dont_tell) { -+ if (input_mode == dont_ask && -+ sym->name && !sym_is_choice_value(sym)) { -+ fprintf(stderr,"CONFIG_%s\n",sym->name); -+ ++return_value; -+ } -+ } else { - if (!conf_cnt++) - printf(_("*\n* Restart config...\n*\n")); - rootEntry = menu_get_parent_menu(menu); - conf(rootEntry); - } - } -+ } - - for (child = menu->list; child; child = child->next) - check_conf(child); -@@ -438,7 +454,7 @@ - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - -- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) { -+ while ((opt = getopt(ac, av, "osbBdD:nmyrh")) != -1) { - switch (opt) { - case 'o': - input_mode = ask_silent; -@@ -447,6 +463,12 @@ - input_mode = ask_silent; - sync_kconfig = 1; - break; -+ case 'b': -+ input_mode = dont_ask; -+ break; -+ case 'B': -+ input_mode = dont_ask_dont_tell; -+ break; - case 'd': - input_mode = set_default; - break; -@@ -510,6 +532,8 @@ - case ask_silent: - case ask_all: - case ask_new: -+ case dont_ask: -+ case dont_ask_dont_tell: - conf_read(NULL); - break; - case set_no: -@@ -571,12 +595,16 @@ - conf(&rootmenu); - input_mode = ask_silent; - /* fall through */ -+ case dont_ask: -+ case dont_ask_dont_tell: - case ask_silent: - /* Update until a loop caused no more changes */ - do { - conf_cnt = 0; - check_conf(&rootmenu); -- } while (conf_cnt); -+ } while (conf_cnt && -+ (input_mode != dont_ask && -+ input_mode != dont_ask_dont_tell)); - break; - } - -@@ -598,5 +626,5 @@ - exit(1); - } - } -- return 0; -+ return return_value; - } |