svn commit: r293375 - stable/10

[Bryan Drewery]

Author: bdrewery
Date: Thu Jan  7 22:05:04 2016
New Revision: 293375
URL: https://svnweb.freebsd.org/changeset/base/293375

Log:
  MFC r291610:
  
    Allow storing package(world|kernel) tarballs into a different location at
    PACKAGEDIR.

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1     Thu Jan  7 21:53:44 2016        (r293374)
+++ stable/10/Makefile.inc1     Thu Jan  7 22:05:04 2016        (r293375)
@@ -116,6 +116,7 @@ CLEANDIR=   cleandir
 .endif
 
 LOCAL_TOOL_DIRS?=
+PACKAGEDIR?=   ${DESTDIR}/${DISTDIR}
 
 BUILDENV_SHELL?=/bin/sh
 
@@ -915,11 +916,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
 
@@ -928,11 +929,11 @@ packageworld:
 .  if defined(NO_ROOT)
        ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
            tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.debug.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/${dist}.debug.txz
 .  else
        ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
            tar cvLf - usr/lib/debug | \
-           ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-debug.txz
+           ${XZ_CMD} > ${PACKAGEDIR}/${dist}-debug.txz
 .  endif
 . endfor
 .endif
@@ -1154,23 +1155,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-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"