summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-01-07 22:05:04 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-01-07 22:05:04 +0000
commitd931913fc595153c76edbd68c8c42d0aa39cc57f (patch)
tree1cb854d91c56b441ae10573f45e9c51eaedc6aad /Makefile.inc1
parentb52158b80d26a6cab7e43346abee96ede1121e31 (diff)
downloadFreeBSD-src-d931913fc595153c76edbd68c8c42d0aa39cc57f.zip
FreeBSD-src-d931913fc595153c76edbd68c8c42d0aa39cc57f.tar.gz
MFC r291610:
Allow storing package(world|kernel) tarballs into a different location at PACKAGEDIR.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc117
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index decacad..28842f4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
OpenPOWER on IntegriCloud