You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/02/14 18:01:58 UTC

[incubator-nuttx] branch master updated: tools/Unix.mk: silence output from version.sh

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/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 176d789  tools/Unix.mk: silence output from version.sh
176d789 is described below

commit 176d78938ff52bc5477f61e1ebb869b40a781084
Author: Juha Niskanen <ju...@haltian.com>
AuthorDate: Mon Feb 14 18:26:57 2022 +0200

    tools/Unix.mk: silence output from version.sh
    
    This fixes error:
    
      tools/Unix.mk:49: *** missing separator. Stop.
    
    that can happen if version.sh is invoked on a git repository
    that contains no tags.
    
    See https://github.com/apache/incubator-nuttx/issues/5324
    
    Signed-off-by: Juha Niskanen <ju...@haltian.com>
---
 tools/Unix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Unix.mk b/tools/Unix.mk
index 565a7e7..d9ea4ee 100644
--- a/tools/Unix.mk
+++ b/tools/Unix.mk
@@ -46,7 +46,7 @@ else
 # Only update .version if the contents of version.tmp actually changes
 # Note: this is executed before any rule is run
 
-$(shell tools/version.sh .version.tmp)
+$(shell tools/version.sh .version.tmp > /dev/null)
 $(shell $(call TESTANDREPLACEFILE, .version.tmp, .version))
 endif