From: Zhang Bingwu <[email protected]>
First patch changed usages of ARCH to SRCARCH.
For some ARCH values, such as i386 and x86_64, SRCARCH is different
from ARCH and arch/$(ARCH) does not exist.
Config fragments merged by merge_into_defconfig and
merge_into_defconfig_override should also be searched for
in kernel/configs/*.config.
When using 'make xxx_defconfig xxx.config' to merge fragments,
scripts/kconfig/Makefile also searches kernel/configs/*.config
for fragments. This behaviour should also be in merge_into_defconfig.
Changed in v2:
- Split changes to two patches
Zhang Bingwu (2):
kbuild: defconf: use SRCARCH to find merged configs
kbuild: find kernel/configs/ for merged fragments
scripts/Makefile.defconf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--
2.43.0
From: Zhang Bingwu <[email protected]>
For some ARCH values, SRCARCH, which should be used for finding arch/
subdirectory, is different from ARCH.
Signed-off-by: Zhang Bingwu <[email protected]>
---
scripts/Makefile.defconf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf
index ab271b205..226ea3df3 100644
--- a/scripts/Makefile.defconf
+++ b/scripts/Makefile.defconf
@@ -9,8 +9,8 @@
# Input config fragments without '.config' suffix
define merge_into_defconfig
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
- -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
- $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
+ -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
+ $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
@@ -23,7 +23,7 @@ endef
# Input config fragments without '.config' suffix
define merge_into_defconfig_override
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
- -Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
- $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
+ -Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
+ $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
--
2.43.0
From: Zhang Bingwu <[email protected]>
kernel/configs consists of several arch-independent config fragments,
which should also be searched for by merge_into_defconfig.
When using 'make xxx_defconfig xxx.config' to merge fragments,
scripts/kconfig/Makefile also searches kernel/configs/*.config
for fragments. This behaviour should also be in merge_into_defconfig.
Signed-off-by: Zhang Bingwu <[email protected]>
---
scripts/Makefile.defconf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf
index 226ea3df3..777be9bf7 100644
--- a/scripts/Makefile.defconf
+++ b/scripts/Makefile.defconf
@@ -10,7 +10,7 @@
define merge_into_defconfig
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
- $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
+ $(foreach config,$(2),$(wildcard $(srctree)/kernel/configs/$(config).config $(srctree)/arch/$(SRCARCH)/configs/$(config).config))
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
@@ -24,6 +24,6 @@ endef
define merge_into_defconfig_override
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
- $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
+ $(foreach config,$(2),$(wildcard $(srctree)/kernel/configs/$(config).config $(srctree)/arch/$(SRCARCH)/configs/$(config).config))
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
--
2.43.0
On Sun, Jan 14, 2024 at 5:14 PM Zhang Bingwu <[email protected]> wrote:
>
> From: Zhang Bingwu <[email protected]>
>
> For some ARCH values, SRCARCH, which should be used for finding arch/
> subdirectory, is different from ARCH.
>
> Signed-off-by: Zhang Bingwu <[email protected]>
As you can see in "git log scripts/Makefile.defconf",
I was not involved in anything about this file.
I do not see much interest in this patch set, but
Arnd Bergmann might be excited about it.
(You did not accompany with a real use case though)
> ---
> scripts/Makefile.defconf | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf
> index ab271b205..226ea3df3 100644
> --- a/scripts/Makefile.defconf
> +++ b/scripts/Makefile.defconf
> @@ -9,8 +9,8 @@
> # Input config fragments without '.config' suffix
> define merge_into_defconfig
> $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
> - -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
> - $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
> + -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
> + $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
> +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
> endef
>
> @@ -23,7 +23,7 @@ endef
> # Input config fragments without '.config' suffix
> define merge_into_defconfig_override
> $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
> - -Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
> - $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
> + -Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
> + $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
> +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
> endef
> --
> 2.43.0
>
>
--
Best Regards
Masahiro Yamada
On Tue, Jan 16, 2024 at 8:28 PM Masahiro Yamada <[email protected]> wrote:
>
> On Sun, Jan 14, 2024 at 5:14 PM Zhang Bingwu <[email protected]> wrote:
> >
> > From: Zhang Bingwu <[email protected]>
> >
> > For some ARCH values, SRCARCH, which should be used for finding arch/
> > subdirectory, is different from ARCH.
> >
> > Signed-off-by: Zhang Bingwu <[email protected]>
>
>
>
> As you can see in "git log scripts/Makefile.defconf",
> I was not involved in anything about this file.
>
> I do not see much interest in this patch set, but
> Arnd Bergmann might be excited about it.
>
> (You did not accompany with a real use case though)
Having said that, 1/2 is a bug fix.
I applied this to linux-kbuild/fixes. Thanks.
--
Best Regards
Masahiro Yamada