aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vagrant
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-06-30 19:18:08 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-06-30 19:18:08 +0000
commit811fc8fd4b782aee9777ab6de94bae5ee689f5ab (patch)
tree185e3eeb29cfab61e52064daa4051d8d20015cdf /release/Makefile.vagrant
parent08126404751ab99d643dac5401b28147f33af685 (diff)
downloadsrc-811fc8fd4b782aee9777ab6de94bae5ee689f5ab.tar.gz
src-811fc8fd4b782aee9777ab6de94bae5ee689f5ab.zip
Default the VAGRANT_VERSION to ${REVISION}-${BRANCH} if
not set, which expands to '11.0-CURRENT', for example. If the branch is -CURRENT, -STABLE, or -PRERELEASE, suffix the VAGRANT_VERSION with the snapshot date. MFC after: 3 days X-MFC-Needs: r284893, r284895, r284896, r284897, r284942 Tested with: head@r284961 (patched) Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=284968
Diffstat (limited to 'release/Makefile.vagrant')
-rw-r--r--release/Makefile.vagrant6
1 files changed, 4 insertions, 2 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index f4b0b9880e5a..ed04944bf7a3 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -11,7 +11,7 @@ VAGRANT_UPLOAD_TGTS= vagrant-check-depends \
CLEANFILES+= ${VAGRANT_UPLOAD_TGTS}
.if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
-. for VAR in _KEY _USERNAME _VERSION
+. for VAR in _KEY _USERNAME
VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}'
ATLAS${VAR}:= ${VAGRANT${VAR}}
. endfor
@@ -21,6 +21,8 @@ ATLAS${VAR}:= ${VAGRANT${VAR}}
SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M
.endif
+VAGRANT_VERSION?= ${REVISION}-${BRANCH}${SNAPSHOT_DATE}
+
VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.box
VAGRANT_PROVIDERS?= vmware_desktop
#VAGRANT_PROVIDERS+= virtualbox
@@ -54,7 +56,7 @@ vagrant-do-package-vmware: vagrant-create-vmware-vmx vagrant-do-package
atlas-do-upload: vagrant-do-package-vmware
.for PROVIDER in ${VAGRANT_PROVIDERS}
- ${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v 0.1
+ ${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
.endfor
touch ${.OBJDIR}/${.TARGET}