From owner-svn-src-all@freebsd.org Tue Jun 30 19:18:08 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2406990C9C; Tue, 30 Jun 2015 19:18:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B94021F0E; Tue, 30 Jun 2015 19:18:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5UJI8hb071871; Tue, 30 Jun 2015 19:18:08 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5UJI8AK071870; Tue, 30 Jun 2015 19:18:08 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506301918.t5UJI8AK071870@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 30 Jun 2015 19:18:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284968 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2015 19:18:09 -0000 Author: gjb Date: Tue Jun 30 19:18:08 2015 New Revision: 284968 URL: https://svnweb.freebsd.org/changeset/base/284968 Log: Default the VAGRANT_VERSION to ${REVISION}-${BRANCH} if not set, which expands to '11.0-CURRENT', for example. If the branch is -CURRENT, -STABLE, or -PRERELEASE, suffix the VAGRANT_VERSION with the snapshot date. MFC after: 3 days X-MFC-Needs: r284893, r284895, r284896, r284897, r284942 Tested with: head@r284961 (patched) Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.vagrant Modified: head/release/Makefile.vagrant ============================================================================== --- head/release/Makefile.vagrant Tue Jun 30 19:06:14 2015 (r284967) +++ head/release/Makefile.vagrant Tue Jun 30 19:18:08 2015 (r284968) @@ -11,7 +11,7 @@ VAGRANT_UPLOAD_TGTS= vagrant-check-depen CLEANFILES+= ${VAGRANT_UPLOAD_TGTS} .if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF) -. for VAR in _KEY _USERNAME _VERSION +. for VAR in _KEY _USERNAME VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}' ATLAS${VAR}:= ${VAGRANT${VAR}} . endfor @@ -21,6 +21,8 @@ ATLAS${VAR}:= ${VAGRANT${VAR}} SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M .endif +VAGRANT_VERSION?= ${REVISION}-${BRANCH}${SNAPSHOT_DATE} + VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.box VAGRANT_PROVIDERS?= vmware_desktop #VAGRANT_PROVIDERS+= virtualbox @@ -54,7 +56,7 @@ vagrant-do-package-vmware: vagrant-creat atlas-do-upload: vagrant-do-package-vmware .for PROVIDER in ${VAGRANT_PROVIDERS} - ${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v 0.1 + ${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION} .endfor touch ${.OBJDIR}/${.TARGET}