diff options
| author | gjb <gjb@FreeBSD.org> | 2015-05-26 20:51:44 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-05-26 20:51:44 +0000 |
| commit | 2f93a7904f7b9a0fb327e9a909adad7c177df8e5 (patch) | |
| tree | 7c2f261da14a9f34131358331a465a97723f1525 | |
| parent | 0df0890db9a4fd80e3602abb04b1b1ffc7b4152a (diff) | |
| download | FreeBSD-src-2f93a7904f7b9a0fb327e9a909adad7c177df8e5.zip FreeBSD-src-2f93a7904f7b9a0fb327e9a909adad7c177df8e5.tar.gz | |
Use SVNREVISION and BUILDDATE if passed into the make(1)
environment, fallback to trying to figure it out otherwise.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | release/Makefile.mirrors | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 69c4815..35ab0c4 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -30,24 +30,26 @@ EMBEDDED= 1 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" SNAPSHOT= 1 TLD?= ${FTPDIR}/snapshots -. for _D in /usr/bin /usr/local/bin -. for _S in svnversion svnliteversion -. if exists(${_D}/${_S}) +. if !defined(SVNREVISION) || empty(SVNREVISION) +. for _D in /usr/bin /usr/local/bin +. for _S in svnversion svnliteversion +. if exists(${_D}/${_S}) SVNVERSION?= ${_D}/${_S} -. endif +. endif +. endfor . endfor -. endfor -. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh) +. if exists(${SVNVERSION}) && !empty(SVNVERSION) +SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile +. endif +. endif # !defined(SVNERVISION) +. if !defined(BUILDDATE) || empty(BUILDDATE) +. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh) BUILDDATE!= cd ${.CURDIR} && date -j -f '%s' $$(stat -f "%c" ${.OBJDIR}/dist/base/bin/sh) +%Y%m%d -. else +. else BUILDDATE!= date +%Y%m%d +. endif . endif -. if exists(${SVNVERSION}) && !empty(SVNVERSION) -SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile _SNAP_SUFFIX:= -r${SVNREVISION}-${BUILDDATE} -. else -_SNAP_SUFFIX:= -${BUILDDATE} -. endif .else # release SNAPSHOT= |
