From 57d94a19cb8273dd5c52d2091283499f65849107 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 1 Jul 2015 14:51:26 +0000 Subject: [PATCH] Remove the HH-MM suffix from the build date suffix. It was useful when working out several kinks when testing automated image uploading when retrying was necessary, but now it is making things much too messy. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- release/Makefile.azure | 2 +- release/Makefile.ec2 | 2 +- release/Makefile.gce | 2 +- release/Makefile.vagrant | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 310b0eb97da8..12fd3484291e 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" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M +SNAPSHOT_DATE!= date +-%Y-%m-%d .endif AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index f0b4459daffd..2695183d90f1 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -6,7 +6,7 @@ # .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" -AMINAMESUFFIX!= date +-%Y-%m-%d-%H-%M +AMINAMESUFFIX!= date +-%Y-%m-%d .endif .if defined(EC2PUBLIC) PUBLISH= --public diff --git a/release/Makefile.gce b/release/Makefile.gce index c864aa1a06ca..b6b6577cc7bd 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -19,7 +19,7 @@ CLEANFILES+= ${GCE_UPLOAD_TGTS} GCE_BUCKET?= .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M +SNAPSHOT_DATE!= date +-%Y-%m-%d .endif # Really? Uppercase characters are not allowed? Sigh... diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index ed04944bf7a3..307e21f72745 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -18,7 +18,7 @@ ATLAS${VAR}:= ${VAGRANT${VAR}} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M +SNAPSHOT_DATE!= date +-%Y-%m-%d .endif VAGRANT_VERSION?= ${REVISION}-${BRANCH}${SNAPSHOT_DATE}