From owner-svn-src-all@freebsd.org  Thu Jun 25 13:40:01 2015
Return-Path: <owner-svn-src-all@freebsd.org>
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 C21A398C817;
 Thu, 25 Jun 2015 13:40:01 +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 94D9816F2;
 Thu, 25 Jun 2015 13:40:01 +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 t5PDe1aM083525;
 Thu, 25 Jun 2015 13:40:01 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PDe0wu083508;
 Thu, 25 Jun 2015 13:40:00 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201506251340.t5PDe0wu083508@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 25 Jun 2015 13:40:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284811 - 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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2015 13:40:01 -0000

Author: gjb
Date: Thu Jun 25 13:40:00 2015
New Revision: 284811
URL: https://svnweb.freebsd.org/changeset/base/284811

Log:
  Consider PRERELEASE builds snapshots, in addition to CURRENT and
  STABLE.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.azure
  head/release/Makefile.ec2
  head/release/Makefile.mirrors

Modified: head/release/Makefile.azure
==============================================================================
--- head/release/Makefile.azure	Thu Jun 25 13:01:10 2015	(r284810)
+++ head/release/Makefile.azure	Thu Jun 25 13:40:00 2015	(r284811)
@@ -16,7 +16,7 @@ AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZU
 . endfor
 .endif
 
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H:%M
 .endif
 

Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2	Thu Jun 25 13:01:10 2015	(r284810)
+++ head/release/Makefile.ec2	Thu Jun 25 13:40:00 2015	(r284811)
@@ -5,7 +5,7 @@
 # Makefile for creating an EC2 AMI from a disk image.
 #
 
-.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
+.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
 AMINAMESUFFIX!=	date +-%Y-%m-%d-%H:%M
 .endif
 .if defined(EC2PUBLIC)

Modified: head/release/Makefile.mirrors
==============================================================================
--- head/release/Makefile.mirrors	Thu Jun 25 13:01:10 2015	(r284810)
+++ head/release/Makefile.mirrors	Thu Jun 25 13:40:00 2015	(r284811)
@@ -27,7 +27,7 @@ EMBEDDED=		1
 .endif
 
 # snapshot
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT=		1
 TLD?=			${FTPDIR}/snapshots
 . if !defined(SVNREVISION) || empty(SVNREVISION)
@@ -63,7 +63,7 @@ BOARDNAME:=		${KERNCONF}
 .  else
 OLDNAME:=		${KERNCONF}
 .  endif
-.  if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.  if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT=		1
 .  endif
 IMAGES:=		img