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 ma...@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]
--
Sincerely,
D.Marck [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer: ma...@freebsd.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru ***
------------------------------------------------------------------------
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
