Date: Tue, 3 Dec 2019 20:02:56 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <o.hartmann@walstatt.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: <46fe135c-5ade-67b4-e237-3ce268c9b0b8@FreeBSD.org> In-Reply-To: <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de> References: <201912040344.xB43ioAQ082850@repo.freebsd.org> <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --tYTfNrQGplhAm0znMgMh9jqiEyqFbXLvA Content-Type: multipart/mixed; boundary="Rxv04t2PmHUDIKf6BjIgAoUaB5Cfp28qe"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <o.hartmann@walstatt.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <46fe135c-5ade-67b4-e237-3ce268c9b0b8@FreeBSD.org> Subject: Re: svn commit: r355379 - head/usr.sbin/mergemaster References: <201912040344.xB43ioAQ082850@repo.freebsd.org> <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de> --Rxv04t2PmHUDIKf6BjIgAoUaB5Cfp28qe Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 12/3/2019 7:55 PM, O. Hartmann wrote: > Am Wed, 4 Dec 2019 03:44:50 +0000 (UTC) > Bryan Drewery <bdrewery@FreeBSD.org> schrieb: >=20 >> Author: bdrewery >> Date: Wed Dec 4 03:44:50 2019 >> New Revision: 355379 >> URL: https://svnweb.freebsd.org/changeset/base/355379 >=20 >> Log: >> Run make in parallel. >=20 >> This is mostly targetting the 'installconfig' phase of 'distribution= ' >> which does a full tree walk. >=20 >> MFC after: 2 weeks >=20 >> Modified: >> head/usr.sbin/mergemaster/mergemaster.sh >=20 >> Modified: head/usr.sbin/mergemaster/mergemaster.sh >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- 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=3D$(realpath "$SOURCEDIR") >=20 >> # Setup make to use system files from SOURCEDIR >> MM_MAKE=3D"make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON" >> +MM_MAKE=3D"${MM_MAKE} -j$(sysctl -n hw.ncpu)" >=20 >> # 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= " >=20 > Whatever I do, mergemaster does not work anymore after this commit: >=20 > [...] > # mergemaster >=20 > /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 untruste= d > users have access to the system. >=20 > 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 >=20 > Default is to use /var/tmp/temproot as is >=20 > How should I deal with this? [Use the existing /var/tmp/temproot] d >=20 > *** Deleting the old /var/tmp/temproot >=20 > *** Creating the temporary root environment in /var/tmp/temproot > *** /var/tmp/temproot ready for use > *** Creating and populating directory structure in /var/tmp/temproot >=20 > make: illegal argument to -j -- must be positive integer! >=20 > *** FATAL ERROR: Cannot 'cd' to /usr/src and install files to > the temproot environment >=20 >=20 > 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. --=20 Regards, Bryan Drewery --Rxv04t2PmHUDIKf6BjIgAoUaB5Cfp28qe-- --tYTfNrQGplhAm0znMgMh9jqiEyqFbXLvA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAl3nL/ZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l88PHAgAzR4xFLy6ia+weowC2C/P7tb1131wzA+bQ8cSoURfcn7SKOU2CZ/1FQE7 W/W/BHRrAK7Td8VRHSw59F5IY2dW3RAmKXJ7Lw3JRIYY4OJbpF11v+nj2n7ekSM8 ZE66pFYmYKyZ4SvxIOGCrE5xzRhmGBMjTYEojCzODjo/tq4ic6T4Tx2jnh2qGBoi CFzURpbGa8zubngLN0Nz4x6E9kjbXK0Ae/OxlJNzzHQ4dbcEXd/yRLIv0QECuMTm U/ehWEJhFKxEskjZsXbmvEpAJvb+R5kVGykMj+eYpIsWyyw1WROSvWmgu3wPhX/X jkqjSDZ+j0FBqqYDNbzEP2mE0mecVA== =VTjy -----END PGP SIGNATURE----- --tYTfNrQGplhAm0znMgMh9jqiEyqFbXLvA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?46fe135c-5ade-67b4-e237-3ce268c9b0b8>