diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-08 18:33:47 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-08 18:33:47 +0000 |
| commit | fd64b90b59a1f489d182f64848c555e0f47d5a3f (patch) | |
| tree | 8750df6ae20ac36d88e7517751a8bef8f5068c9d /release/Makefile.vagrant | |
| parent | 4bffffcaeb99e72e82b4d208701249dee3a8a9ea (diff) | |
| download | FreeBSD-src-fd64b90b59a1f489d182f64848c555e0f47d5a3f.zip FreeBSD-src-fd64b90b59a1f489d182f64848c555e0f47d5a3f.tar.gz | |
Direct commit to fix warnings with fmake when building from top-level.
The top-level Makefile.inc1 uses 'make -C release -V' to lookup revision
information, which causes Makefile.vm and Makefile.vagrant to be included.
fmake has 2 issues here:
1. It doesn't like the empty result of .if ${VAR:Mfoo}
2. It doesn't like .if ${loop_item} ==
Diffstat (limited to 'release/Makefile.vagrant')
| -rw-r--r-- | release/Makefile.vagrant | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 3b53ba9..a8d5f15 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -24,7 +24,7 @@ VAGRANT_VERSION!= date +%Y.%m.%d VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} .if !empty(CLOUDWARE) . for _PROVIDER in ${CLOUDWARE} -. if ${_PROVIDER:MVAGRANT*} +. if !empty(${_PROVIDER:MVAGRANT*}) VAGRANT_PROVIDERS+= ${_PROVIDER:S/VAGRANT-//:tl} . endif . endfor @@ -61,19 +61,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 !empty(${PROVIDER:Mvirtualbox}) @(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 !empty(${PROVIDER:Mvmware}) @(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 !empty(${PROVIDER:Mvirtualbox}) ${.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 !empty(${PROVIDER:Mvmware}) ${.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} |
