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

Remove _ACCOUNT and add _USERNAME, _NAME, _VERSION for the

Browse Source 
VAGRANT_${VAR} variables extracted from VAGRANT_UPLOAD_CONF.

Set ATLAS_${VAR} to VAGRANT_${VAR} if VAGRANT_UPLOAD_CONF
is set.  There is intent to intentionally have separate
variants of configuration entries, but the defaults do not
yet have any reason to be different.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-06-27 22:59:29 +00:00
parent bf97d722f3
commit 02158ab011
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/Makefile.vagrant
View File

@ -12,8 +12,9 @@ VAGRANT_UPLOAD_TGTS= vagrant-check-depends \
CLEANFILES+= ${VAGRANT_UPLOAD_TGTS}
.if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
. for VAR in _ACCOUNT _KEY
VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}'
. for VAR in _KEY _USERNAME _NAME _VERSION
VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}'
ATLAS${VAR}:= ${VAGRANT${VAR}}
. endfor
.endif
@ -26,7 +27,7 @@ VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.box
vagrant-upload: ${VAGRANT_UPLOAD_TGTS}
vagrant-check-depends:
.for VAR in _ACCOUNT _KEY
.for VAR in _KEY _USERNAME _NAME _VERSION
. if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR})
@echo "Variable VAGRANT${VAR} cannot be empty."
@false