Date: Sun, 21 Apr 2013 09:32:58 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Brooks Davis <brooks@freebsd.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r248352 - in stable/9: etc share/mk Message-ID: <5173F89A.70107@FreeBSD.org> In-Reply-To: <alpine.BSF.2.00.1303171807530.80753@woozle.rinet.ru> References: <201303152132.r2FLWfwx076672@svn.freebsd.org> <alpine.BSF.2.00.1303171807530.80753@woozle.rinet.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 3/17/2013 9:10 AM, Dmitry Morozovsky wrote: > On Fri, 15 Mar 2013, Brooks Davis wrote: > >> 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 >> >> Replace all known uses of ln in the build process with appropriate >> install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK >> variables. > > It seems this merge breaks ``make distribution'' and hence mergemaster if your > base system is not updated yet (for example, while updating jail): > > root@castor:/FreeBSD/rinet/src.9.newcarp# uname -a > FreeBSD castor.rinet.ru 9.1-STABLE FreeBSD 9.1-STABLE #0 r245742: Mon Jan 21 > 21:29:07 MSK 2013 marck@castor.rinet.ru:/usr/obj/usr/src/sys/CASTOR amd64 > > root@castor:/FreeBSD/rinet/src.9.newcarp# make hierarchy DESTDIR=/tmp/xxx > cd /FreeBSD/rinet/src.9.newcarp/etc; > /usr/obj/FreeBSD/rinet/src.9.newcarp/make.amd64/make LOCAL_MTREE= distrib-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 /tmp/xxx/var > mtree -deU -f /FreeBSD/rinet/src.9.newcarp/etc/mtree/BSD.usr.dist -p /tmp/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 > > Stop in /FreeBSD/rinet/src.9.newcarp/etc. > > [snip] > I also ran into something similar today upgrading from 9.1-R to HEAD. I had INSTALL=install -C in my make.conf, causing: > /usr/obj/usr/src/tmp/legacy/usr/libexec/catman.local -> /usr/obj/usr/src/tmp/legacy/usr/libexec/makewhatis.local > 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 ... > *** [_installlinks] Error code 64 After updating my make.conf to INSTALL+= -C I was able to finish buildworld. 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? -- Regards, Bryan Drewery [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5173F89A.70107>