Consider PRERELEASE builds snapshots, in addition to CURRENT and

STABLE.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-06-25 13:40:00 +00:00
parent 804121f37a
commit 3c3445e8c7
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=284811
3 changed files with 4 additions and 4 deletions

View file

@ -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

View file

@ -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)

View file

@ -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