You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2020/03/20 07:46:32 UTC

[GitHub] [incubator-nuttx] xiaoxiang781216 opened a new pull request #594: Tools refine

xiaoxiang781216 opened a new pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594
 
 
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] patacongo commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
patacongo commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-601742637
 
 
   
   
   
   
   > 
   > 
   > Any Idea on how to add an test case in this repo, for a relative path custom board?
   
   There is no real requirement that the test case be truly a custom board with external board support.  I think we could create a sim configuration, perhaps called'custom', that could behave like a custom board in how it is configured.
   
   I maybe overlooking somesomething, but I think it is just a matter of setting up all of the CONFIG_BOARD_CUSTOM* values and configuring the sim configuration as though it were a custom board.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395654841
 
 

 ##########
 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:
   Oh OK.
   
   hmm - good to know you have it working - when we do an uptake I will figure out the cause and fix it. 
   
   The other bug was a real problem because it breaks every defconfig on an uptake. Thank you for fixing it!
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] Ouss4 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
Ouss4 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395968672
 
 

 ##########
 File path: tools/configure.sh
 ##########
 @@ -168,16 +164,25 @@ fi
 
 src_config=${configpath}/defconfig
 dest_config="${TOPDIR}/.config"
+backup_config="${TOPDIR}/defconfig"
 
 if [ ! -r ${src_config} ]; then
   echo "File ${src_config} does not exist"
   exit 5
 fi
 
-if [ ${skip} != 1 ] && [ -r ${dest_config} ]; then
-  echo "Already configured!"
-  echo "Do 'make distclean' and try again."
-  exit 6
+if [ -r ${dest_config} ]; then
+  if cmp -s ${src_config} ${backup_config}; then
+    exit 0 # No any config change
 
 Review comment:
   Can we add something here to indicate that this config is already set?

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-601998784
 
 
   @davids5 do you have any more concern? If not, please help merge this PR, thanks.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395627278
 
 

 ##########
 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
   > ```
   > 
   
   The out of tree build is fine in my environment.
   
   > This PR breaks a defconfig on make oldconfig
   > 
   > ![image](https://user-images.githubusercontent.com/1945821/77163814-26e86c80-6a6c-11ea-88eb-d6ad969a0cd6.png)
   
   Please try the new PR, this problem should be fixed.
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 merged pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 merged pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594
 
 
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395977101
 
 

 ##########
 File path: tools/configure.sh
 ##########
 @@ -168,16 +164,25 @@ fi
 
 src_config=${configpath}/defconfig
 dest_config="${TOPDIR}/.config"
+backup_config="${TOPDIR}/defconfig"
 
 if [ ! -r ${src_config} ]; then
   echo "File ${src_config} does not exist"
   exit 5
 fi
 
-if [ ${skip} != 1 ] && [ -r ${dest_config} ]; then
-  echo "Already configured!"
-  echo "Do 'make distclean' and try again."
-  exit 6
+if [ -r ${dest_config} ]; then
+  if cmp -s ${src_config} ${backup_config}; then
+    exit 0 # No any config change
+  fi
+
+  if [ "X${enforce}" = "Xy" ]; then
+    make -C ${TOPDIR} $* distclean 1>/dev/null
 
 Review comment:
   > @xiaoxiang781216 Do you prefer running distclean quietly? For a second I thought my system was hung.
   > (Maybe it's just my slow laptop?)
   
   I will remove "1>/dev/null" if -d is specified.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-602046359
 
 
   @Ouss4 The new PR fix all issue you report, please take a look.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] Ouss4 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
Ouss4 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395968633
 
 

 ##########
 File path: tools/configure.sh
 ##########
 @@ -168,16 +164,25 @@ fi
 
 src_config=${configpath}/defconfig
 dest_config="${TOPDIR}/.config"
+backup_config="${TOPDIR}/defconfig"
 
 if [ ! -r ${src_config} ]; then
   echo "File ${src_config} does not exist"
   exit 5
 fi
 
-if [ ${skip} != 1 ] && [ -r ${dest_config} ]; then
-  echo "Already configured!"
-  echo "Do 'make distclean' and try again."
-  exit 6
+if [ -r ${dest_config} ]; then
+  if cmp -s ${src_config} ${backup_config}; then
+    exit 0 # No any config change
+  fi
+
+  if [ "X${enforce}" = "Xy" ]; then
+    make -C ${TOPDIR} $* distclean 1>/dev/null
 
 Review comment:
   @xiaoxiang781216 Do you prefer running distclean quietly? For a second I thought my system was hung.
   (Maybe it's just my slow laptop?)

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395565487
 
 

 ##########
 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:
   @xiaoxiang781216  - this logic has been broken several times in the past.  Did you test these changes on a custom board with the complete Kconfig life cycle oldconfig, menuconfig, savedefconfig?   
   
   Is CONFIG_ARCH_CUSTOM used?
   
   ```
   CONFIG_ARCH_BOARD_CUSTOM=y
   CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
   CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
   CONFIG_ARCH_BOARD_CUSTOM_NAME="tvc15-pro"
   CONFIG_ARCH_CHIP="stm32h7"
   CONFIG_ARCH_CHIP_STM32H743ZI=y
   CONFIG_ARCH_CHIP_STM32H7=y
   ```

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] Ouss4 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
Ouss4 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-602069349
 
 
   I think this one should be rebased, the commits are fairly independent.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-602067739
 
 
   @xiaoxiang781216, @Ouss4 What do you think:  rebased merge or squash? 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395579851
 
 

 ##########
 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:
   > @xiaoxiang781216 - this logic has been broken several times in the past. Did you test these changes on a custom board with the complete Kconfig life cycle oldconfig, menuconfig, savedefconfig?
   > 
   
   No, I don't have custom board environment. I just test savedefconfig in our internal project.
   
   > Is CONFIG_ARCH_CUSTOM used?
   >
   
   I don't know  I just keep it as before except remove the && check.
   
   > ```
   > CONFIG_ARCH_BOARD_CUSTOM=y
   > CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
   > CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
   > CONFIG_ARCH_BOARD_CUSTOM_NAME="tvc15-pro"
   > CONFIG_ARCH_CHIP="stm32h7"
   > CONFIG_ARCH_CHIP_STM32H743ZI=y
   > CONFIG_ARCH_CHIP_STM32H7=y
   > ```
   
   Does PX4 use custom board? If so, it's better to add a test project use this feature, otherwise it is hard to ensure that we never break this feature without some test.
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395977027
 
 

 ##########
 File path: tools/configure.sh
 ##########
 @@ -168,16 +164,25 @@ fi
 
 src_config=${configpath}/defconfig
 dest_config="${TOPDIR}/.config"
+backup_config="${TOPDIR}/defconfig"
 
 if [ ! -r ${src_config} ]; then
   echo "File ${src_config} does not exist"
   exit 5
 fi
 
-if [ ${skip} != 1 ] && [ -r ${dest_config} ]; then
-  echo "Already configured!"
-  echo "Do 'make distclean' and try again."
-  exit 6
+if [ -r ${dest_config} ]; then
+  if cmp -s ${src_config} ${backup_config}; then
+    exit 0 # No any config change
 
 Review comment:
   Ok, I will add a log

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395591711
 
 

 ##########
 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:
   Yes.  Let me test this....

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-601745637
 
 
   > > Any Idea on how to add an test case in this repo, for a relative path custom board?
   > 
   > There is no real requirement that the test case be truly a custom board with external board support. I think we could create a sim configuration, perhaps called'custom', that could behave like a custom board in how it is configured.
   > 
   > I maybe overlooking somesomething, but I think it is just a matter of setting up all of the CONFIG_BOARD_CUSTOM* values and configuring the sim configuration as though it were a custom board.
   
   Yes, we can put the board in the normal location, but define CONFIG_BOARD_CUSTOM* to trigger the custom board logic.
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-601720989
 
 
   > Any Idea on how to add an test case in this repo, for a relative path custom board?
   
   We can let the relative path point to the normal location:
   boards/arch/chip/board/configs/xxx
   and enable the custom board related config

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395645131
 
 

 ##########
 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:
   > The out of tree build is fine in my environment.
   
   It is not out of tree, it is not under git. 
   
   Does the tools still work without the .git dir?  It use to.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
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
   
   ![image](https://user-images.githubusercontent.com/1945821/77163814-26e86c80-6a6c-11ea-88eb-d6ad969a0cd6.png)
   
   

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395650520
 
 

 ##########
 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:
   > > The out of tree build is fine in my environment.
   > 
   > It is not out of tree, it is not under git.
   > 
   > Does the tools still work without the .git dir? It use to.
   
   Sorry, make you confuse, my "out of tree" mean no git. Here is my test step:
   ```
   mv .git .git.bak
   ./tools/configure.sh sim:nsh
   ```
   The result is same without mv

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on issue #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on issue #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#issuecomment-602071284
 
 
   @Ouss4 - Agreed! 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [incubator-nuttx] davids5 commented on a change in pull request #594: Tools refine

Posted by GitBox <gi...@apache.org>.
davids5 commented on a change in pull request #594: Tools refine
URL: https://github.com/apache/incubator-nuttx/pull/594#discussion_r395643988
 
 

 ##########
 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:
   @xiaoxiang781216 
   
   I am assuming you want me to re-test this PR now that you force pushed or is there a new one?

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services