Re: [PATCH] kconfig: Use KCONFIG_CONFIG instead of .config

[Masahiro Yamada]

On Tue, Dec 5, 2023 at 7:46 PM Markus Schneider-Pargmann
<msp@xxxxxxxxxxxx> wrote:
>
> When using a custom location for kernel config files this merge config
> command fails as it doesn't use the configuration set with
> KCONFIG_CONFIG.
>
> Signed-off-by: Markus Schneider-Pargmann <msp@xxxxxxxxxxxx>
> ---
>

Applied to linux-kbuild.
Thanks.




> Notes:
>     Hi,
>
>     This patch helps me to merge_configs with config files that are not
>     .config (set by using KCONFIG_CONFIG=<PATH>). I am not sure if I break
>     something with that change.
>
>     I didn't add any stable kernels as this is a kernel config issue and no
>     bug in the kernel code itself.
>
>     Best,
>     Markus
>
>  scripts/kconfig/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
> index 4eee155121a8..106159e75d40 100644
> --- a/scripts/kconfig/Makefile
> +++ b/scripts/kconfig/Makefile
> @@ -99,7 +99,7 @@ config-fragments = $(call configfiles,$@)
>
>  %.config: $(obj)/conf
>         $(if $(config-fragments),, $(error $@ fragment does not exists on this architecture))
> -       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(config-fragments)
> +       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(config-fragments)
>         $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
>
>  PHONY += tinyconfig
> --
> 2.43.0
>
>


-- 
Best Regards
Masahiro Yamada