From owner-svn-src-stable-9@FreeBSD.ORG Sun Mar 17 14:10:59 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D65D0437; Sun, 17 Mar 2013 14:10:59 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id 465FB2A4; Sun, 17 Mar 2013 14:10:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id r2HEAwVO082879; Sun, 17 Mar 2013 18:10:58 +0400 (MSK) (envelope-from marck@rinet.ru) Date: Sun, 17 Mar 2013 18:10:58 +0400 (MSK) From: Dmitry Morozovsky To: Brooks Davis Subject: Re: svn commit: r248352 - in stable/9: etc share/mk In-Reply-To: <201303152132.r2FLWfwx076672@svn.freebsd.org> Message-ID: References: <201303152132.r2FLWfwx076672@svn.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (woozle.rinet.ru [0.0.0.0]); Sun, 17 Mar 2013 18:10:58 +0400 (MSK) 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-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2013 14:10:59 -0000 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] -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------