Date: Sat, 27 Jun 2015 23:03:28 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284897 - head/release Message-ID: <201506272303.t5RN3SLm052702@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sat Jun 27 23:03:28 2015 New Revision: 284897 URL: https://svnweb.freebsd.org/changeset/base/284897 Log: Instead of hard-coding the PROVIDERS for upload, add the VAGRANT_PROVIDERS variable. Right now, it defaults to only vmware_desktop, virtualbox support is to follow at some point. While here, fix the hashicorp URL: s/vagrant/atlas/, which was result of a sed(1) replace (and my fault). Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.vagrant Modified: head/release/Makefile.vagrant ============================================================================== --- head/release/Makefile.vagrant Sat Jun 27 22:59:29 2015 (r284896) +++ head/release/Makefile.vagrant Sat Jun 27 23:03:28 2015 (r284897) @@ -23,6 +23,8 @@ SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M .endif VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.box +VAGRANT_PROVIDERS?= vmware_desktop +#VAGRANT_PROVIDERS+= virtualbox vagrant-upload: ${VAGRANT_UPLOAD_TGTS} @@ -52,8 +54,8 @@ vagrant-do-package-vmware: vagrant-creat touch ${.OBJDIR}/${.TARGET} atlas-create-upload: -.for PROVIDER in vmware_desktop virtualbox - /usr/local/bin/curl "https://vagrant.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}" +.for PROVIDER in ${VAGRANT_PROVIDERS} + /usr/local/bin/curl "https://atlas.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}" .endfor touch ${.OBJDIR}/${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506272303.t5RN3SLm052702>