Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Apr 2021 17:45:27 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2183bfcce46b - main - newvers.sh: better regexp for the FreeBSD_version line
Message-ID:  <202104221745.13MHjR7p020361@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=2183bfcce46bf9fe8315de3d7997d28db0a58c18

commit 2183bfcce46bf9fe8315de3d7997d28db0a58c18
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-04-22 16:43:43 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-04-22 17:45:12 +0000

    newvers.sh: better regexp for the FreeBSD_version line
    
    Tested with:            cirrus-ci https://cirrus-ci.com/build/6012323274948608
    Reviewed by:            emaste@, rgrimes@
    Sponsored by:           Netflix
    Differential Revision:  https://reviews.freebsd.org/D29869
---
 sys/conf/newvers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 847c01186aeb..495d9c0e862e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -65,7 +65,7 @@ if [ -z "${SYSDIR}" ]; then
     SYSDIR=$(dirname $0)/..
 fi
 
-RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h})
+RELDATE=$(awk '/^\#define[[:space:]]*__FreeBSD_version/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h})
 
 if [ -r "${SYSDIR}/../COPYRIGHT" ]; then
 	year=$(sed -Ee '/^Copyright .* The FreeBSD Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104221745.13MHjR7p020361>