Commit 71d80662 authored Sep 01, 2010 by Kyle McMartin Committed by Michal Marek Sep 08, 2010

kbuild: fix oldnoconfig to do the right thing



Commit 861b4ea4 broke oldnoconfig when removed the oldnoconfig checks on
                       if (input_mode == nonint_oldconfig ||
                           input_mode == oldnoconfig) {
                               if (input_mode == nonint_oldconfig &&
                                   sym->name &&
                                    !sym_is_choice_value(sym)) {
to avoid oldnoconfig chugging through the else stanza.

Fix that to restore expected behaviour (which I've confirmed in the
Fedora kernel build that the configs end up looking the same.)

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

parent 76a136c4

scripts/kconfig/conf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu)
		if (sym->name && !sym_is_choice_value(sym)) {
		printf("CONFIG_%s\n", sym->name);
		}
		} else {
		} else if (input_mode != oldnoconfig) {
		if (!conf_cnt++)
		printf(_("\n Restart config...\n*\n"));
		rootEntry = menu_get_parent_menu(menu);