From owner-svn-src-stable-11@freebsd.org Thu Dec 19 02:04:41 2019 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25DEF1D0242; Thu, 19 Dec 2019 02:04:41 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47dZvF0DqJz44NG; Thu, 19 Dec 2019 02:04:41 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0335F783C; Thu, 19 Dec 2019 02:04:41 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBJ24eiD060724; Thu, 19 Dec 2019 02:04:40 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBJ24e1X060723; Thu, 19 Dec 2019 02:04:40 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201912190204.xBJ24e1X060723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 19 Dec 2019 02:04:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r355896 - in stable: 11/usr.sbin/ntp 11/usr.sbin/ntp/scripts 12/usr.sbin/ntp 12/usr.sbin/ntp/scripts X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/usr.sbin/ntp 11/usr.sbin/ntp/scripts 12/usr.sbin/ntp 12/usr.sbin/ntp/scripts X-SVN-Commit-Revision: 355896 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2019 02:04:41 -0000 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 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-