svn commit: r261031 - in head: . etc usr.sbin/etcupdate usr.sbin/mergemaster

[John Baldwin]

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 <gjb at FreeBSD.org> 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