From owner-svn-src-head@FreeBSD.ORG Thu Jan 23 20:34:45 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC9873D0; Thu, 23 Jan 2014 20:34:45 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A268017FC; Thu, 23 Jan 2014 20:34:45 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 8E134B964; Thu, 23 Jan 2014 15:34:44 -0500 (EST) From: John Baldwin To: Bryan Drewery Subject: Re: svn commit: r261031 - in head: . etc usr.sbin/etcupdate usr.sbin/mergemaster Date: Thu, 23 Jan 2014 15:03:42 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <201401221659.s0MGxrc7056036@svn.freebsd.org> <201401231439.14819.jhb@freebsd.org> <20140123194841.GA39296@admin.xzibition.com> In-Reply-To: <20140123194841.GA39296@admin.xzibition.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201401231503.42671.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 23 Jan 2014 15:34:44 -0500 (EST) Cc: svn-src-head@freebsd.org, Glen Barber , svn-src-all@freebsd.org, src-committers@freebsd.org, David Chisnall X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2014 20:34:45 -0000 On Thursday, January 23, 2014 2:48:41 pm Bryan Drewery wrote: > On Thu, Jan 23, 2014 at 02:39:14PM -0500, John Baldwin wrote: > > On Thursday, January 23, 2014 10:42:36 am David Chisnall wrote: > > > On 22 Jan 2014, at 22:36, Glen Barber wrote: > > > > > > > It needs to use the build host version, because using (for example) > > > > powerpc resulting binary won't work on and amd64 system. > > > > > > If it's used as part of the build, then it should be part of the toolchain > > target and we should be using the version built there. > > > > 'make distribute' is not a normal part of the build (it's not part of > > buildworld or installworld). Both mergemaster and etcupdate only run it > > after an installworld has been performed, in which case an up-to-date > > services_mkdb should already be installed. > > > > Bryan, what are you running 'make distribute' for? Is this to populate > > a new jail from a world build? > > Yes, poudriere uses this to create jails. It runs: > > export TARGET_ARCH=... > make buildworld > make installworld DESTDIR=... > make distrib-dirs DESTDIR=... DB_FROM_SRC=1 > make distribution DESTDIR=... > > > No mergemaster or etc-update is ran, we just install all of the > defaults. Yes, but you are attemping to install a newer jail than the host, and strictly speaking that isn't supported. (Rather, we only guarantee that a jail will work so long as its world is older or equal in age to the host.) All that said, for stable branches I intend to MFC the new flags to services_mkdb long before possibly merging the change to turn it on in 'make distribution' -- John Baldwin