svn commit: r277681 - in head/sys: conf modules

[Warner Losh]

The number of MK_foo opts that are intruding into the kernel module builds is
starting to get out of hand. :( Especially since they are duplicative of the
MODULES_OVERRIDE functionality and are very unevenly applied.

Warner

> On Jan 24, 2015, at 10:13 PM, Garrett Cooper <ngie at FreeBSD.org> wrote:
> 
> Author: ngie
> Date: Sun Jan 25 05:13:15 2015
> New Revision: 277681
> URL: https://svnweb.freebsd.org/changeset/base/277681
> 
> Log:
>  Build cuse(4) if MK_CUSE != no
> 
>  MFC after: 1 week
>  Sponsored by: EMC / Isilon Storage Division
> 
> Modified:
>  head/sys/conf/kern.opts.mk
>  head/sys/modules/Makefile
> 
> Modified: head/sys/conf/kern.opts.mk
> ==============================================================================
> --- head/sys/conf/kern.opts.mk	Sun Jan 25 04:58:41 2015	(r277680)
> +++ head/sys/conf/kern.opts.mk	Sun Jan 25 05:13:15 2015	(r277681)
> @@ -27,6 +27,7 @@ __DEFAULT_YES_OPTIONS = \
>     CCD \
>     CDDL \
>     CRYPT \
> +    CUSE \
>     FORMAT_EXTENSIONS \
>     INET \
>     INET6 \
> 
> Modified: head/sys/modules/Makefile
> ==============================================================================
> --- head/sys/modules/Makefile	Sun Jan 25 04:58:41 2015	(r277680)
> +++ head/sys/modules/Makefile	Sun Jan 25 05:13:15 2015	(r277681)
> @@ -86,7 +86,6 @@ SUBDIR=	\
> 	${_ct} \
> 	${_ctau} \
> 	ctl \
> -	cuse \
> 	${_cxgb} \
> 	${_cxgbe} \
> 	dc \
> @@ -393,6 +392,10 @@ _random=	random
> .endif
> .endif
> 
> +.if ${MK_CUSE} != "no" || defined(ALL_MODULES)
> +SUBDIR+=	cuse
> +.endif
> +
> .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
> 	defined(ALL_MODULES)
> _carp=		carp
>