On 12/3/2019 7:55 PM, O. Hartmann wrote: > Am Wed, 4 Dec 2019 03:44:50 +0000 (UTC) > Bryan Drewery <bdrew...@freebsd.org> schrieb: > >> Author: bdrewery >> Date: Wed Dec 4 03:44:50 2019 >> New Revision: 355379 >> URL: https://svnweb.freebsd.org/changeset/base/355379 > >> Log: >> Run make in parallel. > >> This is mostly targetting the 'installconfig' phase of 'distribution' >> which does a full tree walk. > >> MFC after: 2 weeks > >> Modified: >> head/usr.sbin/mergemaster/mergemaster.sh > >> Modified: head/usr.sbin/mergemaster/mergemaster.sh >> ============================================================================== >> --- head/usr.sbin/mergemaster/mergemaster.sh Wed Dec 4 03:41:55 2019 >> (r355378) >> +++ head/usr.sbin/mergemaster/mergemaster.sh Wed Dec 4 03:44:50 2019 >> (r355379) >> @@ -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$(sysctl -n hw.ncpu)" > >> # Check DESTDIR against the mergemaster mtree database to see what >> # files the user changed from the reference files. >> _______________________________________________ >> svn-src-h...@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" > > Whatever I do, mergemaster does not work anymore after this commit: > > [...] > # mergemaster > > /usr/sbin/mergemaster: sysctl: not found > *** The directory specified for the temporary root environment, > /var/tmp/temproot, exists. This can be a security risk if untrusted > users have access to the system. > > Use 'd' to delete the old /var/tmp/temproot and continue > Use 't' to select a new temporary root directory > Use 'e' to exit mergemaster > > Default is to use /var/tmp/temproot as is > > How should I deal with this? [Use the existing /var/tmp/temproot] d > > *** Deleting the old /var/tmp/temproot > > *** Creating the temporary root environment in /var/tmp/temproot > *** /var/tmp/temproot ready for use > *** Creating and populating directory structure in /var/tmp/temproot > > make: illegal argument to -j -- must be positive integer! > > *** FATAL ERROR: Cannot 'cd' to /usr/src and install files to > the temproot environment > > >
Should be fixed in r355381. Sorry about that and forgetting to mention your report credit. I admit I didn't test this as I was annoyed with my upgrade being stuck in mergemaster and know that each of these invocations is -j safe. What a silly script to not include /sbin in PATH. -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature