diff options
| author | gjb <gjb@FreeBSD.org> | 2015-06-25 14:58:50 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-06-25 14:58:50 +0000 |
| commit | b1c7823af3da91b256ed232464a29c53e8c62fe1 (patch) | |
| tree | dda94189ba3d6cb85a6c0440e5cae0b5fb0a3fed /release/Makefile.mirrors | |
| parent | 95fcbd85e830ba474dede020a3b792ae31138e2b (diff) | |
| download | FreeBSD-src-b1c7823af3da91b256ed232464a29c53e8c62fe1.zip FreeBSD-src-b1c7823af3da91b256ed232464a29c53e8c62fe1.tar.gz | |
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
Diffstat (limited to 'release/Makefile.mirrors')
| -rw-r--r-- | release/Makefile.mirrors | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index ed10c55..d5e8949 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 |
