From 9f8ac31ffdcbc2e15379746b7e10f7d83def5cf8 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 25 Jun 2015 14:58:50 +0000
Subject: [PATCH] MFC r284780, r284811, r284812:

 r284780:
  Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the
  DESTDIR, otherwise it can get stuck in ttyin.

 r284811:
  Consider PRERELEASE builds snapshots, in addition to CURRENT
  and STABLE.

 r284812:
  Change the hour:minute delimiter from ':' to '-', since
  the former is an invalid character in EC2 images.

Approved by:	re (glebius, insta-MFC)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/stable/10@284813 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/Makefile.azure   | 4 ++--
 release/Makefile.ec2     | 4 ++--
 release/Makefile.mirrors | 4 ++--
 release/tools/ec2.conf   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/release/Makefile.azure b/release/Makefile.azure
index 92ddaf2e7..310b0eb97 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -16,8 +16,8 @@ AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F'	' '{print $$2}
 . endfor
 .endif
 
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H:%M
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
+SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
 .endif
 
 AZURE_TARGET:=		${OSRELEASE}${SNAPSHOT_DATE}.vhd
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index f4e502575..f0b4459da 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -5,8 +5,8 @@
 # Makefile for creating an EC2 AMI from a disk image.
 #
 
-.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
-AMINAMESUFFIX!=	date +-%Y-%m-%d-%H:%M
+.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
+AMINAMESUFFIX!=	date +-%Y-%m-%d-%H-%M
 .endif
 .if defined(EC2PUBLIC)
 PUBLISH=	--public
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index ed10c5553..d5e8949c3 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
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 4969ad560..9472ec59d 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -32,7 +32,7 @@ vm_extra_pre_umount() {
 	# catalogue and install or update pkg when the instance first
 	# launches, so these files would just be replaced anyway; removing
 	# them from the image allows it to boot faster.
-	pkg -c ${DESTDIR} delete -f -y pkg
+	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
 	rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
 
 	# The size of the EC2 root disk can be configured at instance launch
-- 
2.45.0