Date: Sat, 11 Mar 2017 02:20:11 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315043 - stable/11/release Message-ID: <201703110220.v2B2KBng077477@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sat Mar 11 02:20:11 2017 New Revision: 315043 URL: https://svnweb.freebsd.org/changeset/base/315043 Log: MFC r313021, r313027, r313044: r313021 (brd): Force a few variables to be upper case when they are evaulated. r313027 (brd): Add a new vagrant-box target, to make it easier and less redundant to only produce the Vagrant box and not upload it. r313044 (brd): Add some comments with examples on how to build Vagrant images. Sponsored by: The FreeBSD Foundation Modified: stable/11/release/Makefile.vagrant stable/11/release/Makefile.vm Directory Properties: stable/11/ (props changed) Modified: stable/11/release/Makefile.vagrant ============================================================================== --- stable/11/release/Makefile.vagrant Sat Mar 11 02:12:39 2017 (r315042) +++ stable/11/release/Makefile.vagrant Sat Mar 11 02:20:11 2017 (r315043) @@ -1,8 +1,20 @@ # # $FreeBSD$ # +# Makefile for producing and uploading Vagrant boxes to Hashicorp Atlas # -# Makefile for uploading Vagrant boxes to Hashicorp Atlas +# Usage Example: +# Create a Vagrant image for VirtualBox: +# make vagrant-box WITH_VMIMAGES=y WITH_CLOUDWARE=y \ +# CLOUDWARE=vagrant-virtualbox VMFORMATS=vmdk +# +# To create a Vagrant image for VMWare and Upload it to Atlas: +# VAGRANT_KEY is your Atlas API Token +# VAGRANT_USERNAME is your Atlas Username +# env VAGRANT_KEY=foo VAGRANT_USERNAME=bar make vagrant-upload \ +# WITH_VMIMAGES=y WITH_CLOUDWARE=y CLOUDWARE=vagrant-vmware \ +# VMFORMATS=vmdk +# For more info: https://www.vagrantup.com/docs/other/atlas.html # VAGRANT_IMG?= ${.OBJDIR}/vagrant.vmdk @@ -24,8 +36,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 +82,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} Modified: stable/11/release/Makefile.vm ============================================================================== --- stable/11/release/Makefile.vm Sat Mar 11 02:12:39 2017 (r315042) +++ stable/11/release/Makefile.vm Sat Mar 11 02:20:11 2017 (r315043) @@ -57,8 +57,8 @@ cw-${_CW:tl}: env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ - -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW}_FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW}IMAGE} -c ${${_CW}CONF} + -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW}CONF} touch ${.TARGET} cw${_CW:tl}-package:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703110220.v2B2KBng077477>