svn commit: r245803 - in head: . gnu/usr.bin share/man/man5 share/mk usr.bin/dtc

[John Baldwin]

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