From owner-svn-src-all@FreeBSD.ORG Tue Jan 22 18:44:23 2013 Return-Path: Delivered-To: svn-src-all@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 3FE6CC4E; Tue, 22 Jan 2013 18:44:23 +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 0FB95D70; Tue, 22 Jan 2013 18:44:23 +0000 (UTC) Received: from pakbsde14.localnet (unknown [38.105.238.108]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 5A2E9B918; Tue, 22 Jan 2013 13:44:22 -0500 (EST) From: John Baldwin To: David Chisnall Subject: Re: svn commit: r245803 - in head: . gnu/usr.bin share/man/man5 share/mk usr.bin/dtc Date: Tue, 22 Jan 2013 13:38:38 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; ) References: <201301221749.r0MHnpbC053016@svn.freebsd.org> In-Reply-To: <201301221749.r0MHnpbC053016@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201301221338.38628.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 22 Jan 2013 13:44:22 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 18:44:23 -0000 On Tuesday, January 22, 2013 12:49:51 pm David Chisnall wrote: > Author: theraven > Date: Tue Jan 22 17:49:51 2013 > New Revision: 245803 > URL: http://svnweb.freebsd.org/changeset/base/245803 > > Log: > Import new (BSDL) device tree compiler. Now built by default, so that it can't > be used on the host system (and not installed on the device, if required). The > GPL'd one is still available if there are any devices that need it (make > universe passes with it, including kernels that use fdt, but there may be some > out-of-tree ones). WITH_GPL_DTC can be used to select the old one, for now. > > Probably won't be MFC'd, but we'll remove the GPL'd version in head after the > new one has had a lot more testing and ship it in 10.0. > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Tue Jan 22 17:21:08 2013 (r245802) > +++ head/Makefile.inc1 Tue Jan 22 17:49:51 2013 (r245803) > @@ -1112,7 +1112,10 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/ > lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge > .endif > > -.if ${MK_FDT} != "no" > +# Default to building the BSDL DTC, but build the GPL one if users explicitly > +# request it. > +_dtc= /usr.bin/dtc > +.if ${MK_GPL_DTC} != "no" > _dtc= gnu/usr.bin/dtc > .endif Should this use "usr.bin/dtc" rather than "/usr.bin/dtc"? -- John Baldwin