Re: [PATCH] kconfig: fix make oldconfig

[Michal Marek]

On 6.8.2010 07:13, Sam Ravnborg wrote:
> [PATCH] kconfig: fix make oldconfig
> 
> 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@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> 
> Sorry for this regression. Dunno how I missed it.
> I guess I only tested "silentoldconfig".
> 
> Following patch seems obviously correct but as I am on the way
> out of the door I could not do much testing.
> 
> 	Sam
> 
> diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
> index 010600e..274f271 100644
> --- a/scripts/kconfig/conf.c
> +++ b/scripts/kconfig/conf.c
> @@ -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:

Reviewed-by: Michal Marek <mmarek@xxxxxxx>

The problem is that in the previous code, input_mode could never be set
to 'ask_new' ('oldconfig' in the new code), both oldconfig and
silentoldconfig set the variable to 'ask_silent'. Therefore, the 'case
ask_new:' label had no effect here. The fix is correct, both oldconfig
and silentoldconfig jump to the same place again.

Linus, will you apply this directly or should I apply it to the kbuild
tree and send you a pull request?

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/