d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Submitted by:	Russell Cattelan <cattelan@thebarn.com>
Discussed with:	gjb
MFC after:	2 weeks
Obtained from:	OneFS
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-12-01 19:58:08 +00:00
parent c281fdb153
commit 0a63717cfa
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.inc1
View File

@ -144,6 +144,7 @@ CLEANDIR= cleandir
.endif .endif
LOCAL_TOOL_DIRS?= LOCAL_TOOL_DIRS?=
PACKAGEDIR?= ${DESTDIR}/${DISTDIR}
BUILDENV_SHELL?=${SHELL} BUILDENV_SHELL?=${SHELL}
@ -1008,11 +1009,11 @@ packageworld:
${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
tar cvf - --exclude usr/lib/debug \ tar cvf - --exclude usr/lib/debug \
@${DESTDIR}/${DISTDIR}/${dist}.meta | \ @${DESTDIR}/${DISTDIR}/${dist}.meta | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
.else .else
${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
tar cvf - --exclude usr/lib/debug . | \ tar cvf - --exclude usr/lib/debug . | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
.endif .endif
.endfor .endfor
@ -1020,11 +1021,11 @@ packageworld:
. if defined(NO_ROOT) . if defined(NO_ROOT)
${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
. else . else
${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
tar cvLf - usr/lib/debug | \ tar cvLf - usr/lib/debug | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
. endif . endif
.endfor .endfor
@ -1252,23 +1253,23 @@ packagekernel:
.if defined(NO_ROOT) .if defined(NO_ROOT)
cd ${DESTDIR}/${DISTDIR}/kernel; \ cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
.if ${BUILDKERNELS:[#]} > 1 .if ${BUILDKERNELS:[#]} > 1
.for _kernel in ${BUILDKERNELS:[2..-1]} .for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
.endfor .endfor
.endif .endif
.else .else
cd ${DESTDIR}/${DISTDIR}/kernel; \ cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvf - . | \ tar cvf - . | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
.if ${BUILDKERNELS:[#]} > 1 .if ${BUILDKERNELS:[#]} > 1
.for _kernel in ${BUILDKERNELS:[2..-1]} .for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvf - . | \ tar cvf - . | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
.endfor .endfor
.endif .endif
.endif .endif