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.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2015-09-01 15:28:35 +00:00
parent 00e3c0ad5c
commit e727a91c32

@ -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*}