From 656baa2a12c9d56eeacf16f5e512d7fdb9262cc5 Mon Sep 17 00:00:00 2001 From: yinshengkai Date: Sat, 14 Sep 2024 17:46:17 +0800 Subject: [PATCH] tools/Unix.mk: allow defconfig to overwrite old config When using include command in defconfig, it is necessary to support overwriting the configuration in other files kconfig-conf only prints warnings, but does not return errors Signed-off-by: yinshengkai --- tools/Unix.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/Unix.mk b/tools/Unix.mk index 20cfeb8b7b..3b55b3d91e 100644 --- a/tools/Unix.mk +++ b/tools/Unix.mk @@ -657,7 +657,9 @@ define kconfig_tweak_disable kconfig-tweak --file $1 -u $2 endef else - KCONFIG_WARNING = 2> >(tee kwarning) | cat && if [ -s kwarning ]; \ + OVERWRITE_WARNING = "set more than once" + KCONFIG_WARNING = 2> >(grep -v ${OVERWRITE_WARNING} | tee kwarning) | \ + cat && if [ -s kwarning ]; \ then rm kwarning; \ exit 1; \ else \