diff options
| author | gjb <gjb@FreeBSD.org> | 2015-09-04 01:13:40 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-09-04 01:13:40 +0000 |
| commit | d4feb69e909e6ea21e1f23a3d366cf10f2cab99e (patch) | |
| tree | 5effa6c49a426700f29267eb67296c99024685fd /release | |
| parent | 1d0f985306b429f64562d12bf55e3c4628d68c3d (diff) | |
| download | FreeBSD-src-d4feb69e909e6ea21e1f23a3d366cf10f2cab99e.zip FreeBSD-src-d4feb69e909e6ea21e1f23a3d366cf10f2cab99e.tar.gz | |
MFC r287368:
Remove '-' separating OSRELEASE and SNAPSHOT_DATE for vagrant
builds, and prepend it to SNAPSHOT_DATE to prevent a trailing '-'
in the final box name for a release build.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.vagrant | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 7ae6484..3b53ba9 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -17,11 +17,11 @@ ATLAS${VAR}:= ${VAGRANT${VAR}} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +%Y%m%d +SNAPSHOT_DATE!= date +-%Y%m%d .endif VAGRANT_VERSION!= date +%Y.%m.%d -VAGRANT_TARGET:= ${OSRELEASE}-${SNAPSHOT_DATE} +VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} .if !empty(CLOUDWARE) . for _PROVIDER in ${CLOUDWARE} . if ${_PROVIDER:MVAGRANT*} |
