From owner-svn-src-head@freebsd.org Wed Dec 4 04:03:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D7C401C8598; Wed, 4 Dec 2019 04:03:08 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47SQDr5PzPz4MVL; Wed, 4 Dec 2019 04:03:08 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 7E60518AF6; Wed, 4 Dec 2019 04:03:08 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 4608E1B8FC; Wed, 4 Dec 2019 04:03:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id iOWigdpydZEz; Wed, 4 Dec 2019 04:03:03 +0000 (UTC) Subject: Re: svn commit: r355379 - head/usr.sbin/mergemaster DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 1E4C61B8F4 To: "O. Hartmann" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201912040344.xB43ioAQ082850@repo.freebsd.org> <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de> From: Bryan Drewery Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= mQENBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAG0JEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPokBVwQTAQoAQQIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZARYhBPkXPLLDqup6XIofCTXXcbtuRpfPBQJb5hLu BQkNPvODAAoJEDXXcbtuRpfP9rMH/3f7cfX5rzyEV5QNfV/wS4jFukLoPZ4+nCM/TKxH3pEX 2bLbeQbkk6La8cueQ5Lpoht5XFZ18Y5TbMittngltrlNzoDD0h9are24OkDFGim3afJU7tkj IGQa1if+re+vI5BhzYwRhj0oKXzBi39M5oePd3L1dXfx83rg2FPyZBdIejsz6fR74T3JVkbd 6k2l5/3Zk2uiNMy+eBfDRgYE1E6CP28kV0nCeGKZgSVso0kGUUHud7voKqGVpMvbd0mE4pp4 PE5YJaFPjrll9miaDAvdU8LGIq5n6+aXPLKoQ/QNl6mg6ifgI6FfKILOkTizLW8E5PBSNnCm NapQ55yjm125AQ0EUmmGawEIAKJUU9+Q19oW1RK5jTf3m56j+szIc8Y9DaLC8REUKl4UZJBK BqCl6c0cukVApOD92XoU6hJPm2rLEyp/IcYcPPNTnVu8D8h9oag2L8EiFN7+2hk0xG+lwjc8 uOIZycme7AIJsBU4AZ1v63lxm2k104hwpiatgbe71GIGl7p1MX6ousP/wGzXCOF25Dx9w02C eRe7zEMfhnFjSUhzdCC9han2+KaVB7qIqNR3b8NfbwRNlwPmHqlhXffUow9OsQjSnTK8WKNR lx7xzVccXIvWP2wECFrmqmzMmXpSrmIuiWEpFwZ9x2a0Pva8dCNRiCVTK51IlRXKjaAxiN1u IUrMm6UAEQEAAYkBPAQYAQoAJgIbDBYhBPkXPLLDqup6XIofCTXXcbtuRpfPBQJb5hL4BQkN PvONAAoJEDXXcbtuRpfPCjcH/ivBsOpdpebpgLizSNU5/X4yWN5Aixsc9VBnQhGKAKnMINJQ VMpA55sD2JSPwloXYM/B3qyPJRS/9cwIuX5LDNKKOZU3Qp+TzleynM15/xea14orWYRGRict YHBM3Cnqp7OD8K6Q1uhs0fTxyJP7PZ/G0+7Corlf1DlHhDt6C2HldRPFvAvAgl6sR9Wzgcb7 rzub2HVtbJgl6YHbgyAG7x9NpXFqzx1JLAMdpt2DIYwoi+oMdRQlBIwNuKjQjCGzuXHandd3 kGvBAsyJpQ+coEep9UzwANaV28cXrFr2R4FSOcR50rBA2Nh/vqUYfpsvBvJlwuKAoV1djVHa ihNeL5E= Organization: FreeBSD Message-ID: <46fe135c-5ade-67b4-e237-3ce268c9b0b8@FreeBSD.org> Date: Tue, 3 Dec 2019 20:02:56 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191204045531.10ce17d2@thor.intern.walstatt.dynvpn.de> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tYTfNrQGplhAm0znMgMh9jqiEyqFbXLvA" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2019 04:03:08 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --tYTfNrQGplhAm0znMgMh9jqiEyqFbXLvA Content-Type: multipart/mixed; boundary="Rxv04t2PmHUDIKf6BjIgAoUaB5Cfp28qe"; protected-headers="v1" From: Bryan Drewery To: "O. Hartmann" 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 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--