From 3c3445e8c784b429ad8a6e421fa9485d59c1d344 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 25 Jun 2015 13:40:00 +0000
Subject: [PATCH] Consider PRERELEASE builds snapshots, in addition to CURRENT
 and STABLE.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.azure   | 2 +-
 release/Makefile.ec2     | 2 +-
 release/Makefile.mirrors | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/Makefile.azure b/release/Makefile.azure
index 92ddaf2e7253..e53d1a654618 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -16,7 +16,7 @@ AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F'	' '{print $$2}
 . endfor
 .endif
 
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H:%M
 .endif
 
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index f4e502575eb4..cbea5e68d2b3 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -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)
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index ed10c5553bbd..d5e8949c3831 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -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