diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-13 13:45:58 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-13 13:45:58 -0300 |
| commit | e52aa5f667faebee85874ec39c29fa1257dd554f (patch) | |
| tree | b08cff1a8d0fb8f667942aca5b9a8be9fb5dca03 /release | |
| parent | 945ed01c4bae06169f63978e43029c04d4abd731 (diff) | |
| parent | 8096b85f202b18e1be6a5dd5251a10fcdb255a78 (diff) | |
| download | FreeBSD-src-e52aa5f667faebee85874ec39c29fa1257dd554f.zip FreeBSD-src-e52aa5f667faebee85874ec39c29fa1257dd554f.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.vagrant | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 3b53ba9..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 ${_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 ${PROVIDER} == "virtualbox" +. 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 ${PROVIDER} == "vmware" +. 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 ${PROVIDER} == "virtualbox" +. 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" +. 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} |
