From 0dd16fd9d1a21b6043b06baf06ccff3687406a12 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 23 May 2019 17:19:05 +0000 Subject: [PATCH] Move to using newvers -c instead of VARS_ONLY=1 Use newvers.sh -c to get the copyright, and newvers.sh -V RELDATE to get the release date. Differential Revision: https://reviews.freebsd.org/D19849 --- include/mk-osreldate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh index cf7d55a43697..037a308fa826 100755 --- a/include/mk-osreldate.sh +++ b/include/mk-osreldate.sh @@ -38,8 +38,8 @@ trap "rm -f $tmpfile" EXIT ${ECHO} creating osreldate.h from newvers.sh set +e -VARS_ONLY=1 -. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}" || exit 1 +COPYRIGHT=$(sh ${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh} -c) || exit 1 +eval $(sh ${NEWVERS_SH} -V RELDATE) || exit 1 set -e cat > $tmpfile <