svn commit: r355896 - in stable: 11/usr.sbin/ntp 11/usr.sbin/ntp/scripts 12/usr.sbin/ntp 12/usr.sbin/ntp/scripts

[Kyle Evans]

Author: kevans
Date: Thu Dec 19 02:04:40 2019
New Revision: 355896
URL: https://svnweb.freebsd.org/changeset/base/355896

Log:
  usr.sbin/ntp: don't emit versions w/ make -s
  
  <sys.mk> defines ECHO=echo when not using make -s, and ECHO=true when using
  make -s.
  
  export ECHO for ntp products and use it in the mkver script to echo the
  version. This suppresses the output as appropriate. ECHO is given a default
  value to make sure things still work as expected for anyone that isn't
  redefining ECHO.

Modified:
  stable/11/usr.sbin/ntp/Makefile.inc
  stable/11/usr.sbin/ntp/scripts/mkver
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/usr.sbin/ntp/Makefile.inc
  stable/12/usr.sbin/ntp/scripts/mkver
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/usr.sbin/ntp/Makefile.inc
==============================================================================
--- stable/11/usr.sbin/ntp/Makefile.inc	Thu Dec 19 01:34:34 2019	(r355895)
+++ stable/11/usr.sbin/ntp/Makefile.inc	Thu Dec 19 02:04:40 2019	(r355896)
@@ -16,4 +16,6 @@ CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
 
 WARNS?=	0
 
+.export ECHO
+
 .include "../Makefile.inc"

Modified: stable/11/usr.sbin/ntp/scripts/mkver
==============================================================================
--- stable/11/usr.sbin/ntp/scripts/mkver	Thu Dec 19 01:34:34 2019	(r355895)
+++ stable/11/usr.sbin/ntp/scripts/mkver	Thu Dec 19 02:04:40 2019	(r355896)
@@ -4,6 +4,8 @@
 #
 PROG=${1-UNKNOWN}
 
+: ${ECHO:=echo}
+
 ConfStr="$PROG"
 
 ConfStr="$ConfStr 4.2.8p12"
@@ -32,7 +34,7 @@ echo $RUN > .version
 
 ConfStr="$ConfStr (${RUN})"
 
-echo "Version <${ConfStr}>";
+${ECHO} "Version <${ConfStr}>";
 
 rm -f version.c
 cat > version.c << -EoF-