svn commit: r291610 - head

[Bryan Drewery]

Author: bdrewery
Date: Tue Dec  1 19:58:08 2015
New Revision: 291610
URL: https://svnweb.freebsd.org/changeset/base/291610

Log:
  Allow storing package(world|kernel) tarballs into a different location at 
PACKAGEDIR.
  
  Submitted by: Russell Cattelan <catte...@thebarn.com>
  Discussed with:       gjb
  MFC after:    2 weeks
  Obtained from:        OneFS
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Tue Dec  1 19:37:24 2015        (r291609)
+++ head/Makefile.inc1  Tue Dec  1 19:58:08 2015        (r291610)
@@ -144,6 +144,7 @@ CLEANDIR=   cleandir
 .endif
 
 LOCAL_TOOL_DIRS?=
+PACKAGEDIR?=   ${DESTDIR}/${DISTDIR}
 
 BUILDENV_SHELL?=${SHELL}
 
@@ -1008,11 +1009,11 @@ packageworld:
        ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
            tar cvf - --exclude usr/lib/debug \
            @${DESTDIR}/${DISTDIR}/${dist}.meta | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
 .else
        ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
            tar cvf - --exclude usr/lib/debug . | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
 .endif
 .endfor
 
@@ -1020,11 +1021,11 @@ packageworld:
 . if defined(NO_ROOT)
        ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
            tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
 . else
        ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
            tar cvLf - usr/lib/debug | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
 . endif
 .endfor
 
@@ -1252,23 +1253,23 @@ packagekernel:
 .if defined(NO_ROOT)
        cd ${DESTDIR}/${DISTDIR}/kernel; \
            tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .if ${BUILDKERNELS:[#]} > 1
 .for _kernel in ${BUILDKERNELS:[2..-1]}
        cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
            tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
 .endfor
 .endif
 .else
        cd ${DESTDIR}/${DISTDIR}/kernel; \
            tar cvf - . | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .if ${BUILDKERNELS:[#]} > 1
 .for _kernel in ${BUILDKERNELS:[2..-1]}
        cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
            tar cvf - . | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
 .endfor
 .endif
 .endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"