Date: Mon, 13 Jan 2020 19:30:19 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356697 - stable/12/usr.sbin/mergemaster Message-ID: <202001131930.00DJUJeW052868@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Jan 13 19:30:18 2020 New Revision: 356697 URL: https://svnweb.freebsd.org/changeset/base/356697 Log: MFC r355379,r355381: r355379: Run make in parallel. r355381: Use full path to sysctl(8) since /sbin is not in PATH. Modified: stable/12/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/12/usr.sbin/mergemaster/mergemaster.sh Mon Jan 13 19:22:52 2020 (r356696) +++ stable/12/usr.sbin/mergemaster/mergemaster.sh Mon Jan 13 19:30:18 2020 (r356697) @@ -508,6 +508,7 @@ SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON" +MM_MAKE="${MM_MAKE} -j$(/sbin/sysctl -n hw.ncpu)" # Check DESTDIR against the mergemaster mtree database to see what # files the user changed from the reference files.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001131930.00DJUJeW052868>