From e5f5cbd42cb67a969c352fc35e4cd1ac363b55c9 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 21 Jun 2015 12:37:31 +0000
Subject: [PATCH] Append the hour and minute to the snapshot suffix for EC2
 AMIs and Azure VM images.  This is particularly helpful for testing to avoid
 name collisions, but also useful for cases where a necessary rebuild is done
 before the date changes.

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

diff --git a/release/Makefile.azure b/release/Makefile.azure
index 01e2204d08f4..92ddaf2e7253 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -17,7 +17,7 @@ AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F'	' '{print $$2}
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d
+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 4efdc7fa27b6..f4e502575eb4 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -6,7 +6,7 @@
 #
 
 .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
-AMINAMESUFFIX!=	date +-%Y-%m-%d
+AMINAMESUFFIX!=	date +-%Y-%m-%d-%H:%M
 .endif
 .if defined(EC2PUBLIC)
 PUBLISH=	--public