This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 656baa2a12 tools/Unix.mk: allow defconfig to overwrite old config
656baa2a12 is described below
commit 656baa2a12c9d56eeacf16f5e512d7fdb9262cc5
Author: yinshengkai <[email protected]>
AuthorDate: Sat Sep 14 17:46:17 2024 +0800
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 <[email protected]>
---
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 \
