mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
Append the branch commit count to _SNAP_SUFFIX for development
snapshot builds. Sponsored by: Rubicon Communications, LLC (netgate.com)
This commit is contained in:
parent
08241fedc4
commit
d3df64ad99
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=368704
|
@ -21,11 +21,17 @@ GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbrev-ref HEAD 2>/dev/null | s
|
||||||
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD 2>/dev/null || true
|
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD 2>/dev/null || true
|
||||||
. export GITREV
|
. export GITREV
|
||||||
. endif
|
. endif
|
||||||
|
. if !defined(GITCOUNT) || empty(GITCOUNT)
|
||||||
|
GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --count HEAD 2>/dev/null || true
|
||||||
|
. export GITCOUNT
|
||||||
|
. endif
|
||||||
.else
|
.else
|
||||||
GITBRANCH= nullbranch
|
GITBRANCH= nullbranch
|
||||||
GITREV= nullhash
|
GITREV= nullhash
|
||||||
|
GITCOUNT= nullcount
|
||||||
. export GITBRANCH
|
. export GITBRANCH
|
||||||
. export GITREV
|
. export GITREV
|
||||||
|
. export GITCOUNT
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Set the build date, primarily for snapshot builds.
|
# Set the build date, primarily for snapshot builds.
|
||||||
|
|
|
@ -33,7 +33,7 @@ TLD?= ${FTPDIR}/snapshots
|
||||||
.if !defined(BUILDDATE) || empty(BUILDDATE)
|
.if !defined(BUILDDATE) || empty(BUILDDATE)
|
||||||
BUILDDATE!= date +%Y%m%d
|
BUILDDATE!= date +%Y%m%d
|
||||||
.endif
|
.endif
|
||||||
_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}
|
_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}-${GITCOUNT}
|
||||||
.else
|
.else
|
||||||
# release
|
# release
|
||||||
SNAPSHOT=
|
SNAPSHOT=
|
||||||
|
|
Loading…
Reference in a new issue