Date: Wed, 4 Dec 2019 04:55:04 +0100 From: "O. Hartmann" <o.hartmann@walstatt.org> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r355379 - head/usr.sbin/mergemaster Message-ID: <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201912040344.xB43ioAQ082850@repo.freebsd.org> References: <201912040344.xB43ioAQ082850@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am Wed, 4 Dec 2019 03:44:50 +0000 (UTC) Bryan Drewery <bdrewery@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-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@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 - -- O. Hartmann Ich widerspreche der Nutzung oder Übermittlung meiner Daten für Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG). -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCXecuNAAKCRA4N1ZZPba5 RyWgAQDevXV1bwx86CgwU7tOUYE3G+1PKz5fgntVnXT684ZJXAD/S4VXwBiQx7zC Ioc0eJ1r3xyejYtDJAQojcAHSdmHygY= =6NmG -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191204045531.10ce17d2>