From owner-svn-src-stable@FreeBSD.ORG Sun Apr 21 14:33:03 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 131F54D5 for ; Sun, 21 Apr 2013 14:33:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E3DC9153D for ; Sun, 21 Apr 2013 14:33:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3LEX2nR045086 for ; Sun, 21 Apr 2013 14:33:02 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3LEX24j045081 for svn-src-stable@freebsd.org; Sun, 21 Apr 2013 14:33:02 GMT (envelope-from bdrewery) Received: (qmail 29060 invoked from network); 21 Apr 2013 09:33:01 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 21 Apr 2013 09:33:01 -0500 Message-ID: <5173F89A.70107@FreeBSD.org> Date: Sun, 21 Apr 2013 09:32:58 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: Brooks Davis Subject: Re: svn commit: r248352 - in stable/9: etc share/mk References: <201303152132.r2FLWfwx076672@svn.freebsd.org> In-Reply-To: X-Enigmail-Version: 1.5.1 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2ENLHVGGMDSUNKJWSXAPC" Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Apr 2013 14:33:03 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2ENLHVGGMDSUNKJWSXAPC Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 3/17/2013 9:10 AM, Dmitry Morozovsky wrote: > On Fri, 15 Mar 2013, Brooks Davis wrote: >=20 >> Author: brooks >> Date: Fri Mar 15 21:32:40 2013 >> New Revision: 248352 >> URL: http://svnweb.freebsd.org/changeset/base/248352 >> >> Log: >> MFC r245752,246913,247162 >> =20 >> Replace all known uses of ln in the build process with appropriate >> install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK >> variables. >=20 > It seems this merge breaks ``make distribution'' and hence mergemaster = if your=20 > base system is not updated yet (for example, while updating jail): >=20 > root@castor:/FreeBSD/rinet/src.9.newcarp# uname -a > FreeBSD castor.rinet.ru 9.1-STABLE FreeBSD 9.1-STABLE #0 r245742: Mon J= an 21=20 > 21:29:07 MSK 2013 marck@castor.rinet.ru:/usr/obj/usr/src/sys/CASTOR= amd64 >=20 > root@castor:/FreeBSD/rinet/src.9.newcarp# make hierarchy DESTDIR=3D/tmp= /xxx > cd /FreeBSD/rinet/src.9.newcarp/etc;=20 > /usr/obj/FreeBSD/rinet/src.9.newcarp/make.amd64/make LOCAL_MTREE=3D dis= trib-dirs > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.root.dist -p /= tmp/xxx/ > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.var.dist -p /t= mp/xxx/var > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.usr.dist -p /t= mp/xxx/usr > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.include.dist -= p /tmp/xxx/usr/include > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BIND.chroot.dist -= p /tmp/xxx/var/named > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.groff.dist -p = /tmp/xxx/usr > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.sendmail.dist = -p /tmp/xxx/ > install -l s usr/src/sys /tmp/xxx/sys > install: illegal option -- l > usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode] > [-o owner] file1 file2 > install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode] > [-o owner] file1 ... fileN directory > install -d [-v] [-g group] [-m mode] [-o owner] directory ... > *** [distrib-dirs] Error code 64 >=20 > Stop in /FreeBSD/rinet/src.9.newcarp/etc. >=20 > [snip] >=20 I also ran into something similar today upgrading from 9.1-R to HEAD. I had INSTALL=3Dinstall -C in my make.conf, causing: > /usr/obj/usr/src/tmp/legacy/usr/libexec/catman.local -> /usr/obj/usr/sr= c/tmp/legacy/usr/libexec/makewhatis.local > install: illegal option -- l >=20 > usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode] > [-o owner] file1 file2 > install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode] > [-o owner] file1 ... fileN directory > install -d [-v] [-g group] [-m mode] [-o owner] directory ... > *** [_installlinks] Error code 64 After updating my make.conf to INSTALL+=3D -C I was able to finish buildw= orld. I suggest updating the examples to not encourage overriding INSTALL like this: http://people.freebsd.org/~bdrewery/INSTALL-buildworld-install-l.txt This may warrant an UPDATING entry as well. Thoughts? --=20 Regards, Bryan Drewery ------enig2ENLHVGGMDSUNKJWSXAPC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRc/ibAAoJEG54KsA8mwz5EOwQAKmhpCKDe+uZQyKMv3xOSwJM ZIl6HbHdPvUpX5BlfGd1yS0pKiwSzFjVIxs04Oz4KWSC8GvLEVMX2t49zEbzRPpY UNJgu1KZyYk084GHnGofGl53aWzOBHvY3BGmX6u1VLxrZRH+m7YhVkxVCWBlG25E 6ldBeOuKYLI1tljJkj0dCuY7uUZUHUDTDKk6V7k8HYKdNZRjzDqA4AbDxYxhKdO3 Qm7EzvzpQBOfm2Yfaw8+4dvOjFqAR8uLpErS0xbc2ZNC/tRpCTsiXfMKc2XRY0v6 CJJUj9WE57F78N3u2MJb/6Gr9rqbcLomVDd+VkU4d7Er5DZfs22RtRIzRbWnMOIG 3QZCa6hfE7uc1IprDVmZ7tpL8SlNRHkBnIWLIOb92PDw1haJwZ84njr/CQzhRWVX 5chiY+EbCsT5foxbzTM7XMeWDdNf46v8xJivIA6V3R31TyzgU92RWkDFWVE2bEOs 2vz0/xnjmfqjo8ryXcPXXZs87IItjuBAwVTH/uaCIdnVAdRLbFCftktp+zduB7Ql 4hFne4++GMnS6CtkeDg/vDcDwExASnGoVQMXc8VdWk0xdrkWO0jOujsTiltCI9LW MLpTytDup7Rbpq87xFNP6hANMJLiBFggP9hrU0vBPTBMxtmadldmt1tzzIa1qYuE kPxX6xmiyrYuqWZgtcaj =7VVR -----END PGP SIGNATURE----- ------enig2ENLHVGGMDSUNKJWSXAPC--