From 22e777cf0851a7ec84da92841d89fe05952e4098 Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz Date: Sun, 9 Jul 2023 23:17:18 -0300 Subject: [PATCH] tools: Fix BASE_DEFCONFIG generation --- tools/Unix.mk | 2 +- tools/Win.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Unix.mk b/tools/Unix.mk index 879ec7b865..439066b2ff 100644 --- a/tools/Unix.mk +++ b/tools/Unix.mk @@ -250,7 +250,7 @@ tools/mkconfig$(HOSTEXEEXT): include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig$(HOSTEXEEXT) $(Q) grep -v "CONFIG_BASE_DEFCONFIG" "$(TOPDIR)/.config" > "$(TOPDIR)/.config.tmp" $(Q) if ! cmp -s "$(TOPDIR)/.config.tmp" "$(TOPDIR)/.config.orig" ; then \ - sed -i.bak "/CONFIG_BASE_DEFCONFIG/s/\"$$/-dirty\"/" "$(TOPDIR)/.config"; \ + sed -i.bak -e "/CONFIG_BASE_DEFCONFIG/ { /-dirty/! s/\"$$/-dirty\"/; }" "$(TOPDIR)/.config" ; \ else \ sed -i.bak "s/-dirty//g" "$(TOPDIR)/.config"; \ fi diff --git a/tools/Win.mk b/tools/Win.mk index 55e68b767d..483910339c 100644 --- a/tools/Win.mk +++ b/tools/Win.mk @@ -238,7 +238,7 @@ include\nuttx\config.h: $(TOPDIR)\.config tools\mkconfig$(HOSTEXEEXT) $(Q) grep -v "CONFIG_BASE_DEFCONFIG" "$(TOPDIR)\.config" > "$(TOPDIR)\.config.tmp" # In-place edit can mess up permissions on Windows $(Q) if ! cmp -s "$(TOPDIR)\.config.tmp" "$(TOPDIR)\.config.orig" ; then \ - sed "/CONFIG_BASE_DEFCONFIG/s/\"$$/-dirty\"/" "$(TOPDIR)\.config" > "$(TOPDIR)\.config-temp"; \ + sed "/CONFIG_BASE_DEFCONFIG/ { /-dirty/! s/\"$$/-dirty\"/ }" "$(TOPDIR)\.config" > "$(TOPDIR)\.config-temp"; \ else \ sed "s/-dirty//g" "$(TOPDIR)\.config" > "$(TOPDIR)\.config-temp"; \ fi