diff options
| author | gjb <gjb@FreeBSD.org> | 2015-06-27 22:59:29 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-06-27 22:59:29 +0000 |
| commit | f6cc5eb780d25c9b1d174397fcb5f774447f5238 (patch) | |
| tree | a5297bfb5a0d554236eaffb60bfc04e05c9b9046 | |
| parent | 2913e26145cba756b49d374455d8e286685185d1 (diff) | |
| download | FreeBSD-src-f6cc5eb780d25c9b1d174397fcb5f774447f5238.zip FreeBSD-src-f6cc5eb780d25c9b1d174397fcb5f774447f5238.tar.gz | |
Remove _ACCOUNT and add _USERNAME, _NAME, _VERSION for the
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
| -rw-r--r-- | release/Makefile.vagrant | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index de97189..b8b7fb1 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -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 |
