From: Zhang Bingwu <xtex@envs.net>
To: Masahiro Yamada <masahiroy@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Zhang Bingwu <xtexchooser@duck.com>
Subject: [PATCH v2 2/2] kbuild: find kernel/configs/ for merged fragments
Date: Sun, 14 Jan 2024 16:14:00 +0800 [thread overview]
Message-ID: <20240114081400.12452-3-xtex@envs.net> (raw)
In-Reply-To: <20240114081400.12452-1-xtex@envs.net>
From: Zhang Bingwu <xtexchooser@duck.com>
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 <xtexchooser@duck.com>
---
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
prev parent reply other threads:[~2024-01-14 8:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-13 0:11 [PATCH 0/1] kbuild: find kernel/configs for fragments in fragment merging Zhang Bingwu
2024-01-13 0:11 ` [PATCH 1/1] " Zhang Bingwu
2024-01-14 8:13 ` [PATCH v2 0/2] kbuild: find kernel/configs for merged fragments Zhang Bingwu
2024-01-14 8:13 ` [PATCH v2 1/2] kbuild: defconf: use SRCARCH to find merged configs Zhang Bingwu
2024-01-16 11:28 ` Masahiro Yamada
2024-01-27 16:13 ` Masahiro Yamada
2024-01-14 8:14 ` Zhang Bingwu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240114081400.12452-3-xtex@envs.net \
--to=xtex@envs.net \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
--cc=xtexchooser@duck.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox