aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vagrant
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2017-01-31 21:59:10 +0000
committerBrad Davis <brd@FreeBSD.org>2017-01-31 21:59:10 +0000
commitef7a48206d8ed8f4a33ef1931ae3d8fb94458f4a (patch)
treec6832987cbec4ff797aa94c095d177e18637d0bb /release/Makefile.vagrant
parent39d5467677ef468eac9040e0c4fb24fc8f332465 (diff)
downloadsrc-ef7a48206d8ed8f4a33ef1931ae3d8fb94458f4a.tar.gz
src-ef7a48206d8ed8f4a33ef1931ae3d8fb94458f4a.zip
Add a new vagrant-box target, to make it easier and less redundant to only
produce the Vagrant box and not upload it. Approved by: re (gjb)
Notes
Notes: svn path=/head/; revision=313027
Diffstat (limited to 'release/Makefile.vagrant')
-rw-r--r--release/Makefile.vagrant9
1 files changed, 6 insertions, 3 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index 3b53ba928b25..045292de1784 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -24,8 +24,8 @@ VAGRANT_VERSION!= date +%Y.%m.%d
VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}
.if !empty(CLOUDWARE)
. for _PROVIDER in ${CLOUDWARE}
-. if ${_PROVIDER:MVAGRANT*}
-VAGRANT_PROVIDERS+= ${_PROVIDER:S/VAGRANT-//:tl}
+. if ${_PROVIDER:tu:MVAGRANT*}
+VAGRANT_PROVIDERS+= ${_PROVIDER:tu:S/VAGRANT-//:tl}
. endif
. endfor
.endif
@@ -70,13 +70,16 @@ ${VAGRANT_TARGET}.${PROVIDER}.box: ${PROVIDER} cw-vagrant-${PROVIDER} vagrant-cr
. endif
CLEANFILES+= vagrant-do-upload-${PROVIDER}
-vagrant-do-upload-${PROVIDER}: ${VAGRANT_TARGET}.${PROVIDER}.box
+vagrant-do-upload-${PROVIDER}: vagrant-box
. if ${PROVIDER} == "virtualbox"
${.CURDIR}/scripts/atlas-upload.sh -b ${TYPE}-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET}.${PROVIDER}.box -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
. elif ${PROVIDER} == "vmware"
${.CURDIR}/scripts/atlas-upload.sh -b ${TYPE}-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET}.${PROVIDER}.box -p ${PROVIDER}_desktop -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
. endif
touch ${.OBJDIR}/${.TARGET}
+
+vagrant-box: ${VAGRANT_TARGET}.${PROVIDER}.box
+
.endfor
vagrant-upload: ${VAGRANT_UPLOAD_TGTS}