davids5 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395606863
##########
File path: tools/Makefile.unix
##########
@@ -565,17 +547,15 @@ do_gconfig: dirlinks apps_preconfig
gconfig: do_gconfig clean_context
-do_savedefconfig: dirlinks apps_preconfig
-
-savedefconfig: do_savedefconfig
+savedefconfig: dirlinks apps_preconfig
$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --savedefconfig
defconfig.tmp Kconfig
$(Q) sed -i -e "/CONFIG_APPS_DIR=/d" defconfig.tmp
$(Q) grep "CONFIG_ARCH=" .config >> defconfig.tmp
$(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true
- $(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true
- $(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD="
.config >> defconfig.tmp; true
- $(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM"
.config >> defconfig.tmp; true
- $(Q) grep "^CONFIG_ARCH_BOARD_CUSTOM=" .config && grep
"^CONFIG_ARCH_BOARD_CUSTOM" .config >> defconfig.tmp; true
+ $(Q) grep "CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true
+ $(Q) grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true
+ $(Q) grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true
+ $(Q) grep "^CONFIG_ARCH_BOARD_CUSTOM" .config >> defconfig.tmp; true
Review comment:
On master and this branch the version.sh fails out of a git tree. I have
lost track of it's requirements and intent.
Here is the hack I used to get past it.
```
diff --git a/tools/version.sh b/tools/version.sh
index a53b3cfbcc..5988186f2c 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -85,8 +85,15 @@ done
OUTFILE=$1
+INGIT=$(git rev-parse --is-inside-work-tree)
+
if [ -z ${VERSION} ] ; then
- VERSION=`git tag --sort=taggerdate | tail -1 | cut -d'-' -f2`
+ if [ "X${INGIT}" = "Xtrue" ] ; then
+ VERSION=`git tag --sort=taggerdate | tail -1 | cut -d'-' -f2`
+ else
+ VERSION="0.0"
+ BUILD="na"
+ fi
fi
# Make sure we know what is going on
```
This PR breaks a defconfig on make oldconfig
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
