Author: gjb
Date: Wed Dec 16 18:40:49 2020
New Revision: 368704
URL: https://svnweb.freebsd.org/changeset/base/368704
Log:
Append the branch commit count to _SNAP_SUFFIX for development
snapshot builds.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.inc1
head/release/Makefile.mirrors
Modified: head/release/Makefile.inc1
==============================================================================
--- head/release/Makefile.inc1 Wed Dec 16 18:01:41 2020 (r368703)
+++ head/release/Makefile.inc1 Wed Dec 16 18:40:49 2020 (r368704)
@@ -21,11 +21,17 @@ GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbre
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD
2>/dev/null || true
. export GITREV
. endif
+. if !defined(GITCOUNT) || empty(GITCOUNT)
+GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --count HEAD 2>/dev/null ||
true
+. export GITCOUNT
+. endif
.else
GITBRANCH= nullbranch
GITREV= nullhash
+GITCOUNT= nullcount
. export GITBRANCH
. export GITREV
+. export GITCOUNT
.endif
# Set the build date, primarily for snapshot builds.
Modified: head/release/Makefile.mirrors
==============================================================================
--- head/release/Makefile.mirrors Wed Dec 16 18:01:41 2020
(r368703)
+++ head/release/Makefile.mirrors Wed Dec 16 18:40:49 2020
(r368704)
@@ -33,7 +33,7 @@ TLD?= ${FTPDIR}/snapshots
.if !defined(BUILDDATE) || empty(BUILDDATE)
BUILDDATE!= date +%Y%m%d
.endif
-_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}
+_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}-${GITCOUNT}
.else
# release
SNAPSHOT=
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
