Author: brd (doc,ports committer)
Date: Tue Jan 31 21:59:10 2017
New Revision: 313027
URL: https://svnweb.freebsd.org/changeset/base/313027
Log:
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)
Modified:
head/release/Makefile.vagrant
Modified: head/release/Makefile.vagrant
==============================================================================
--- head/release/Makefile.vagrant Tue Jan 31 20:57:40 2017
(r313026)
+++ head/release/Makefile.vagrant Tue Jan 31 21:59:10 2017
(r313027)
@@ -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: ${PRO
. 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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
