]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
kconfig: fix make oldconfig
authorSam Ravnborg <sam@ravnborg.org>
Fri, 6 Aug 2010 05:13:54 +0000 (07:13 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 16:17:02 +0000 (09:17 -0700)
Linus wrote:
 This seems to make "make oldconfig" a _lot_ more verbose than it
 used to be. In a very annoying way.

 I just did a quick git bisect. It's introduced by commit 4062f1a4c030
 ("kconfig: use long options in conf") by Sam Ravnborg. Apparently that
 thing is totally buggy, and doesn't just change the option names, but
 actively breaks them.

The old behaviour (from years ago) were reintroduced by accident.  Fix
this so we are back to the version that are silent if there is nothing
to ask about.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
scripts/kconfig/conf.c

index 010600ef58c0293fa9f73110c42bb14a707a8ed0..274f2716b03e9d4b0a5865a86a09b11799359523 100644 (file)
@@ -599,12 +599,12 @@ int main(int ac, char **av)
                break;
        case savedefconfig:
                break;
-       case oldconfig:
        case oldaskconfig:
                rootEntry = &rootmenu;
                conf(&rootmenu);
                input_mode = silentoldconfig;
                /* fall through */
+       case oldconfig:
        case listnewconfig:
        case oldnoconfig:
        case silentoldconfig: