From 7ee01d2b1ed90cb6db761bcb25e80f31c74a6fe2 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 21 May 2015 20:22:55 +0000
Subject: [PATCH] Include xz(1)-compressed images when not a snapshot build.

Do not suffix non-snapshot checksum files with SNAP_SUFFIX.

Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.mirrors | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index 32d7b2ec00bd..20866c00923b 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -104,9 +104,11 @@ iso-images-stage:
 . endfor
 .else	# !snapshot
 	cd ${TLD}/ISO-IMAGES/${REVISION} && ln -s \
-		../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${IMAGE} .
+		../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${IMAGE}
+	cd ${TLD}/ISO-IMAGES/${REVISION} && ln -s \
+		../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${IMAGE}.xz
 	cd ${ISO_DIR} && ${CHECKSUM:tl} ${OSRELEASE}* > \
-		CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX}
+		CHECKSUM.${CHECKSUM}-${OSRELEASE}
 .endif
 .if exists(${RELEASEDIR}/ftp)
 	mkdir -p ${FTP_DIR}