Date: Fri, 4 Sep 2015 01:13:41 +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-10@freebsd.org Subject: svn commit: r287449 - stable/10/release Message-ID: <201509040113.t841Df6x059375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Sep 4 01:13:40 2015 New Revision: 287449 URL: https://svnweb.freebsd.org/changeset/base/287449 Log: MFC r287368: Remove '-' separating OSRELEASE and SNAPSHOT_DATE for vagrant builds, and prepend it to SNAPSHOT_DATE to prevent a trailing '-' in the final box name for a release build. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile.vagrant Directory Properties: stable/10/ (props changed) Modified: stable/10/release/Makefile.vagrant ============================================================================== --- stable/10/release/Makefile.vagrant Fri Sep 4 01:02:21 2015 (r287448) +++ stable/10/release/Makefile.vagrant Fri Sep 4 01:13:40 2015 (r287449) @@ -17,11 +17,11 @@ ATLAS${VAR}:= ${VAGRANT${VAR}} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +%Y%m%d +SNAPSHOT_DATE!= date +-%Y%m%d .endif VAGRANT_VERSION!= date +%Y.%m.%d -VAGRANT_TARGET:= ${OSRELEASE}-${SNAPSHOT_DATE} +VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} .if !empty(CLOUDWARE) . for _PROVIDER in ${CLOUDWARE} . if ${_PROVIDER:MVAGRANT*}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509040113.t841Df6x059375>