d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usr.sbin/ntp: don't emit versions w/ make -s

Browse Source 
<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.

Reviewed by:	cy
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D22101
This commit is contained in:
Kyle Evans 2019-12-12 01:33:45 +00:00
parent b81ca5bac8
commit 5bff36fe81
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/ntp/Makefile.inc
View File

@ -16,4 +16,6 @@ CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
WARNS?= 0 WARNS?= 0
.export ECHO
.include "../Makefile.inc" .include "../Makefile.inc"

4
usr.sbin/ntp/scripts/mkver
View File

@ -4,6 +4,8 @@
# #
PROG=${1-UNKNOWN} PROG=${1-UNKNOWN}
: ${ECHO:=echo}
ConfStr="$PROG" ConfStr="$PROG"
ConfStr="$ConfStr 4.2.8p12" ConfStr="$ConfStr 4.2.8p12"
@ -32,7 +34,7 @@ echo $RUN > .version
ConfStr="$ConfStr (${RUN})" ConfStr="$ConfStr (${RUN})"
echo "Version <${ConfStr}>"; ${ECHO} "Version <${ConfStr}>";
rm -f version.c rm -f version.c
cat > version.c << -EoF- cat > version.c << -EoF-