svn commit: r248352 - in stable/9: etc share/mk

[Bryan Drewery]

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 at 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 at castor.rinet.ru:/usr/obj/usr/src/sys/CASTOR  amd64
> 
> root at 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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-stable/attachments/20130421/7cb71fa4/attachment.sig>