From owner-svn-src-stable-9@FreeBSD.ORG Wed Mar 20 18:43:53 2013 Return-Path: Delivered-To: svn-src-stable-9@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 BE223AC2; Wed, 20 Mar 2013 18:43:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 93475D28; Wed, 20 Mar 2013 18:43:53 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 025D2B917; Wed, 20 Mar 2013 14:43:53 -0400 (EDT) From: John Baldwin To: Brooks Davis Subject: Re: svn commit: r248352 - in stable/9: etc share/mk Date: Wed, 20 Mar 2013 09:18:08 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201303152132.r2FLWfwx076672@svn.freebsd.org> <20130319200631.GC80942@lor.one-eyed-alien.net> In-Reply-To: <20130319200631.GC80942@lor.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201303200918.08803.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 20 Mar 2013 14:43:53 -0400 (EDT) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Dmitry Morozovsky , 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: Wed, 20 Mar 2013 18:43:53 -0000 On Tuesday, March 19, 2013 4:06:31 pm Brooks Davis wrote: > On Tue, Mar 19, 2013 at 09:49:47PM +0400, Dmitry Morozovsky wrote: > > On Tue, 19 Mar 2013, Brooks Davis wrote: > > > > > > > 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): > > > > > > Sorry for the delay in responding. I missed this yesterday. > > > > > > It works for me on a older 9.0-STABLE system where the base install > > > doesn't support -l. Did you build world or run "make toolchain" in that > > > source tree to build the bootstrap copy of install? > > > > Yes, this is after full ``make buildworld buildkernel'' process. > > I've found the problem thanks to misc/177055. It is that mergemaster > (and etcupdate) set MAKEOBJDIRPREFIX to something in their > temporary directory and thus deprive themselves of bootstrap tools. > Unfortunately, I don't see a trivial fix so I've backed this out for > now and will work on this in HEAD. Hummmm. In the case of etcupdate you can use 'etcupdate -B'. That is actually safe to do in the common case where you've just updated /usr/src and built the corresponding world in /usr/obj. It should possibly even by the default for etcupdate if a DESTDIR is not specified. -- John Baldwin