diff options
| author | Brad Davis <brd@FreeBSD.org> | 2017-01-31 21:59:10 +0000 |
|---|---|---|
| committer | Brad Davis <brd@FreeBSD.org> | 2017-01-31 21:59:10 +0000 |
| commit | ef7a48206d8ed8f4a33ef1931ae3d8fb94458f4a (patch) | |
| tree | c6832987cbec4ff797aa94c095d177e18637d0bb /release | |
| parent | 39d5467677ef468eac9040e0c4fb24fc8f332465 (diff) | |
Notes
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.vagrant | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 3b53ba928b255..045292de1784d 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} |