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

2014-01-24 Thread John Baldwin
On Thursday, January 23, 2014 5:48:34 pm Peter Wemm wrote: On 1/23/14, 2:12 PM, John Baldwin wrote: On Thursday, January 23, 2014 4:22:56 pm Bryan Drewery wrote: On Thu, Jan 23, 2014 at 03:03:42PM -0500, John Baldwin wrote: On Thursday, January 23, 2014 2:48:41 pm Bryan Drewery wrote: On

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

2014-01-23 Thread David Chisnall
On 22 Jan 2014, at 22:36, Glen Barber g...@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

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

2014-01-23 Thread John Baldwin
On Thursday, January 23, 2014 10:42:36 am David Chisnall wrote: On 22 Jan 2014, at 22:36, Glen Barber g...@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,

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

2014-01-23 Thread Bryan Drewery
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 g...@freebsd.org wrote: It needs to use the build host version, because using (for example) powerpc resulting binary won't

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

2014-01-23 Thread 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 g...@freebsd.org wrote: It needs to use the build host

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

2014-01-23 Thread Bryan Drewery
On Thu, Jan 23, 2014 at 03:03:42PM -0500, John Baldwin wrote: 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

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

2014-01-23 Thread Bryan Drewery
On Thu, Jan 23, 2014 at 03:22:56PM -0600, Bryan Drewery wrote: On Thu, Jan 23, 2014 at 03:03:42PM -0500, John Baldwin wrote: 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

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

2014-01-23 Thread Peter Wemm
On 1/23/14, 2:12 PM, John Baldwin wrote: On Thursday, January 23, 2014 4:22:56 pm Bryan Drewery wrote: On Thu, Jan 23, 2014 at 03:03:42PM -0500, John Baldwin wrote: 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

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

2014-01-23 Thread John-Mark Gurney
Peter Wemm wrote this message on Thu, Jan 23, 2014 at 14:48 -0800: On 1/23/14, 2:12 PM, John Baldwin wrote: On Thursday, January 23, 2014 4:22:56 pm Bryan Drewery wrote: On Thu, Jan 23, 2014 at 03:03:42PM -0500, John Baldwin wrote: On Thursday, January 23, 2014 2:48:41 pm Bryan Drewery

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

2014-01-22 Thread John Baldwin
Author: jhb Date: Wed Jan 22 16:59:53 2014 New Revision: 261031 URL: http://svnweb.freebsd.org/changeset/base/261031 Log: Generate /var/db/services.db during 'make distribution' so that it is present during new installs. Update etcupdate and mergemaster to ignore the generated file.

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

2014-01-22 Thread Glen Barber
On Thu, Jan 23, 2014 at 12:19:22AM -0600, Bryan Drewery wrote: Modified: head/etc/Makefile == --- head/etc/Makefile Wed Jan 22 16:50:18 2014(r261030) +++ head/etc/Makefile Wed Jan 22 16:59:53