Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e9203c988234aa512bd45ca32b52e21c7bbfc414

Authored by Kyle McMartin
Committed by Michal Marek
1 parent 71ebc01d3a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

scripts/kconfig/conf.c
Diff comments   View file @ e9203c9
... ... @@ -427,7 +427,7 @@
427 427 if (sym->name && !sym_is_choice_value(sym)) {
428 428 printf("CONFIG_%s\n", sym->name);
429 429 }
430   - } else {
  430 + } else if (input_mode != oldnoconfig) {
431 431 if (!conf_cnt++)
432 432 printf(_("*\n* Restart config...\n*\n"));
433 433 rootEntry = menu_get_parent_menu(menu);