Date: Tue, 12 May 2015 00:27:52 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282787 - head/release Message-ID: <201505120027.t4C0Rq1A083024@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505120027.t4C0Rq1A083024>