From 54a03abb682cf9ca6449fb5da17823817d3252da Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 31 Oct 2017 00:03:29 +0000 Subject: [PATCH] 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 --- release/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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