[U-Boot] [PATCH v4 02/10] moveconfig: Ignore duplicate configs when moving

[Masahiro Yamada]

2015-05-16 6:40 GMT+09:00 Joe Hershberger <joe.hershberger at ni.com>:
> When moving configs, it is important to know what was defined in the
> config header even if it duplicates the configs coming from Kconfig.
>
> This is specifically needed for the case where a config is set to
> default 'y' in the Kconfig. This would previously cause the actual value
> from the include config to be filtered out, and moveconfig.py would
> think that it was 'n'... This means that the value that should be 'y'
> is now (in every defconfig) set to 'not set'.
>
> tools/moveconfig.py now defines KCONFIG_IGNORE_DUPLICATES to prevent the
> filtering from happening and selecting wrong values for the defconfig.
>
> Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>
>
> ---
>
> Changes in v4: None
> Changes in v3:
> -New for version 3
>
> Changes in v2: None
>
>  scripts/Makefile.autoconf | 3 ++-
>  tools/moveconfig.py       | 1 +
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
> index f054081..36bfa17 100644
> --- a/scripts/Makefile.autoconf
> +++ b/scripts/Makefile.autoconf
> @@ -58,7 +58,8 @@ quiet_cmd_autoconf = GEN     $@
>         $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
>                 sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp |               \
>                 while read line; do                                                     \
> -                       if ! grep -q "$${line%=*}=" include/config/auto.conf; then      \
> +                       if [ -n "${KCONFIG_IGNORE_DUPLICATES}" ] ||                     \
> +                          ! grep -q "$${line%=*}=" include/config/auto.conf; then      \
>                                 echo "$$line";                                          \
>                         fi                                                              \
>                 done > $@;                                                              \
> diff --git a/tools/moveconfig.py b/tools/moveconfig.py
> index 544f6af..d3009de 100755
> --- a/tools/moveconfig.py
> +++ b/tools/moveconfig.py
> @@ -632,6 +632,7 @@ class Slot:
>          cmd = list(self.make_cmd)
>          if cross_compile:
>              cmd.append('CROSS_COMPILE=%s' % cross_compile)
> +        cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
>          cmd.append('include/config/auto.conf')
>          self.ps = subprocess.Popen(cmd, stdout=self.devnull)
>          self.state = STATE_AUTOCONF
> --


Now, I fully understood your intention.
This comes from our work-flow differences.

Because I edited the Kconfig after moving configs that are default to y,
so I did not notice this necessity.

Anyway, we should do it beforehand for savedefconfig.

So, this looks good to me.

Acked-by: Masahiro Yamada <yamada.masahiro at socionext.com>


-- 
Best Regards
Masahiro Yamada