kconfig: Use KCONFIG_CONFIG instead of .config
PATCH 1/1 kconfig: Use KCONFIG_CONFIG instead of .config
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.
---
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(-)
scripts/kconfig/Makefile +1 -1
@@ -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
Signature · 1 line
2.43.0
Quoted 8 lines · Markus Schneider-Pargmann
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 <[email protected]>---
Applied to linux-kbuild.
Thanks.
Quoted 33 lines
Notes:
Hi,This patch helps me to
merge_configswith 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,
Markusscripts/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/kconfig/Makefile +1
-2@@ -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
Signature · 2 lines
Best Regards Masahiro Yamada