[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20231004124837.56536-3-bjorn@kernel.org>
Date: Wed, 4 Oct 2023 14:48:37 +0200
From: Björn Töpel <bjorn@...nel.org>
To: linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org,
Masahiro Yamada <masahiroy@...nel.org>,
linux-kbuild@...r.kernel.org, Shuah Khan <shuah@...nel.org>
Cc: Björn Töpel <bjorn@...osinc.com>,
bpf@...r.kernel.org, netdev@...r.kernel.org
Subject: [PATCH 2/2] kbuild: Merge per-arch config for kselftest-merge target
From: Björn Töpel <bjorn@...osinc.com>
Some kselftests has a per-arch config,
e.g. tools/testing/selftests/bpf/config.s390x.
Make sure these configs are picked up by the kselftest-merge target.
Signed-off-by: Björn Töpel <bjorn@...osinc.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 170fb2f5e378..0303acb311cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1367,7 +1367,7 @@ kselftest-%: headers FORCE
PHONY += kselftest-merge
kselftest-merge:
$(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
- $(Q)find $(srctree)/tools/testing/selftests -name config | \
+ $(Q)find $(srctree)/tools/testing/selftests -name config -o -name config.$(UTS_MACHINE) | \
xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config
$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
--
2.39.2
Powered by blists - more mailing lists