From owner-svn-src-head@FreeBSD.ORG  Tue May 12 00:27:53 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0F3248ED;
 Tue, 12 May 2015 00:27:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D92B312CA;
 Tue, 12 May 2015 00:27:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4C0Rqut083025;
 Tue, 12 May 2015 00:27:52 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4C0Rq1A083024;
 Tue, 12 May 2015 00:27:52 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505120027.t4C0Rq1A083024@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 12 May 2015 00:27:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282787 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 00:27:53 -0000

Author: gjb
Date: Tue May 12 00:27:52 2015
New Revision: 282787
URL: https://svnweb.freebsd.org/changeset/base/282787

Log:
  Always use the 'make install' directory as the source for images.
  For RE purposes, we use the default (/R within the chroot), so
  this helps avoid copying files multiple times and xz(1)-compressing
  additional times when not needed.
  
  Again, this Makefile is not for general consumption.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.mirrors

Modified: head/release/Makefile.mirrors
==============================================================================
--- head/release/Makefile.mirrors	Tue May 12 00:27:20 2015	(r282786)
+++ head/release/Makefile.mirrors	Tue May 12 00:27:52 2015	(r282787)
@@ -11,6 +11,7 @@
 .include "${.CURDIR}/Makefile"
 
 FTPDIR?=		/ftp
+RELEASEDIR?=		/R
 STAGE_TARGETS?=		iso-images-stage
 
 # snapshot
@@ -57,12 +58,17 @@ FTP_DIR=		${TLD}/${TARGET}/${TARGET_ARCH
 iso-images-stage:
 	mkdir -p ${ISO_DIR}
 	mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
-.for IMAGE in ${IMAGES}
-	cp -p ${.OBJDIR}/${IMAGE} ${ISO_DIR}/${OSRELEASE}-${IMAGE}
-. if exists(/R/${IMAGE}.xz)
-	cp -p ${.OBJDIR}/${IMAGE}.xz ${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
+.if exists(${RELEASEDIR})
+	@# Assume we have images to copy.
+. for IMAGE in ${IMAGES}
+	cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE} \
+		${ISO_DIR}/${OSRELEASE}-${IMAGE}
+.  if exists(/R/${IMAGE}.xz)
+	cp -p ${RELEASEDIR}/${IMAGE}.xz \
+		${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
 . endif
-.endfor
+.endif
+
 .if defined(SNAPSHOT) && !empty(SNAPSHOT)
 . for IMAGE in ${IMAGES}
 	cd ${ISO_DIR} && mv ${OSRELEASE}-${IMAGE} \
@@ -84,9 +90,9 @@ iso-images-stage:
 	cd ${ISO_DIR} && ${CHECKSUM:tl} ${OSRELEASE}* > \
 		CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
 .endif
-.if exists(${.OBJDIR}/ftp)
+.if exists(${RELEASEDIR}/ftp)
 	mkdir -p ${FTP_DIR}
-	cp ${.OBJDIR}/ftp/*.txz ${.OBJDIR}/ftp/MANIFEST ${FTP_DIR}
+	cp ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR}
 	cd ${TLD}/${TARGET} && \
 		ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
 			${REVISION}-${BRANCH}