summaryrefslogtreecommitdiffstats
path: root/release/Makefile.vagrant
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-10-09 19:18:02 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-10-09 19:18:02 +0000
commita5a007aeef18b9399b11dfa6954bdd527eb62275 (patch)
treed763186ba099e94dc108b9b6e56102c7e6d1ac61 /release/Makefile.vagrant
parent35506ac39e328e6be31ce347a43cccec556a42ae (diff)
downloadFreeBSD-src-a5a007aeef18b9399b11dfa6954bdd527eb62275.zip
FreeBSD-src-a5a007aeef18b9399b11dfa6954bdd527eb62275.tar.gz
The fmake fix in r289049 was wrong. Need to use a real variable for
.if checks rather than the iteration variable. Tested this pattern more (rather than just looking for error) and found the right behavior.
Diffstat (limited to 'release/Makefile.vagrant')
-rw-r--r--release/Makefile.vagrant12
1 files changed, 7 insertions, 5 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index a8d5f15..2d7fe1f 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -24,7 +24,8 @@ VAGRANT_VERSION!= date +%Y.%m.%d
VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}
.if !empty(CLOUDWARE)
. for _PROVIDER in ${CLOUDWARE}
-. if !empty(${_PROVIDER:MVAGRANT*})
+_provider= ${_PROVIDER}
+. if ${_provider:MVAGRANT*}
VAGRANT_PROVIDERS+= ${_PROVIDER:S/VAGRANT-//:tl}
. endif
. endfor
@@ -51,6 +52,7 @@ vagrant-check-depends:
.endif
.for PROVIDER in ${VAGRANT_PROVIDERS}
+_provider= ${PROVIDER}
CLEANFILES+= vagrant-do-package-${PROVIDER} ${VAGRANT_TARGET}.${PROVIDER}.box
CLEANDIRS+= ${PROVIDER}
VAGRANT_UPLOAD_TGTS+= vagrant-do-upload-${PROVIDER}
@@ -61,19 +63,19 @@ ${PROVIDER}:
${VAGRANT_TARGET}.${PROVIDER}.box: ${PROVIDER} cw-vagrant-${PROVIDER} vagrant-create-${PROVIDER}-metadata
@echo "==> PACKAGING: ${VAGRANT_TARGET}.${PROVIDER}.box in `pwd`"
@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
-. if !empty(${PROVIDER:Mvirtualbox})
+. if ${_provider} == virtualbox
@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf vagrant.vmdk)
-. elif !empty(${PROVIDER:Mvmware})
+. elif ${_provider} == vmware
@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx vagrant.vmdk)
. endif
CLEANFILES+= vagrant-do-upload-${PROVIDER}
vagrant-do-upload-${PROVIDER}: ${VAGRANT_TARGET}.${PROVIDER}.box
-. if !empty(${PROVIDER:Mvirtualbox})
+. 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 !empty(${PROVIDER:Mvmware})
+. 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}
OpenPOWER on IntegriCloud