This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch releases/12.2 in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/releases/12.2 by this push: new 8ed5d562ee Revert "tools: Fix CONFIG_BASE_DEFCONFIG generation" 8ed5d562ee is described below commit 8ed5d562eee7c7d26fe9fa7b8ea0a8597b900748 Author: Petro Karashchenko <petro.karashche...@gmail.com> AuthorDate: Mon Jul 3 00:15:54 2023 +0300 Revert "tools: Fix CONFIG_BASE_DEFCONFIG generation" This reverts commit bc4266fa485e02b6e711a385167294d0c9055261. --- 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 62f74b8c6f..879ec7b865 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/ { /-dirty/! s/\"$$/-dirty\"/ }" "$(TOPDIR)/.config"; \ + sed -i.bak "/CONFIG_BASE_DEFCONFIG/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 483910339c..55e68b767d 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/ { /-dirty/! s/\"$$/-dirty\"/ }" "$(TOPDIR)\.config" > "$(TOPDIR)\.config-temp"; \ + sed "/CONFIG_BASE_DEFCONFIG/s/\"$$/-dirty\"/" "$(TOPDIR)\.config" > "$(TOPDIR)\.config-temp"; \ else \ sed "s/-dirty//g" "$(TOPDIR)\.config" > "$(TOPDIR)\.config-temp"; \ fi