svn commit: r355379 - head/usr.sbin/mergemaster
O. Hartmann
o.hartmann at walstatt.org
Wed Dec 4 03:55:51 UTC 2019
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Am Wed, 4 Dec 2019 03:44:50 +0000 (UTC)
Bryan Drewery <bdrewery at 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 at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at 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-----
More information about the svn-src-all
mailing list