d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a new vagrant-box target, to make it easier and less redundant to only

Browse Source 
produce the Vagrant box and not upload it.

Approved by:	re (gjb)
This commit is contained in:
Brad Davis 2017-01-31 21:59:10 +00:00
parent 39d5467677
commit ef7a48206d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=313027
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/Makefile.vagrant
View File

@ -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}