aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-10-31 00:03:29 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-10-31 00:03:29 +0000
commit54a03abb682cf9ca6449fb5da17823817d3252da (patch)
treef46d68b05bdd560f7132bbdab6934fa88a930eb2
parent04760bd70d8b111bf17bbececaa815093cf0210d (diff)
downloadsrc-54a03abb682cf9ca6449fb5da17823817d3252da.tar.gz
src-54a03abb682cf9ca6449fb5da17823817d3252da.zip
Run mm-mtree with whatever -j value the build is using.
Reviewed by: gjb Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12807
Notes
Notes: svn path=/head/; revision=325179
-rw-r--r--release/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index 864ab0b2a1b6..c7f880588756 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -132,7 +132,8 @@ base.txz:
cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR}
# Set up mergemaster root database
sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
- "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${.OBJDIR}/${DISTDIR}/base"
+ "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \
+ -D "${.OBJDIR}/${DISTDIR}/base"
etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
-s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate"
# Package all components