svn commit: r267440 - in head: lib share/mk sys/modules sys/sys

[Hans Petter Selasky]

Author: hselasky
Date: Fri Jun 13 08:53:49 2014
New Revision: 267440
URL: http://svnweb.freebsd.org/changeset/base/267440

Log:
  Attach the CUSE library and kernel module to the default FreeBSD
  builds. Bump the FreeBSD version number.

Modified:
  head/lib/Makefile
  head/share/mk/src.opts.mk
  head/sys/modules/Makefile
  head/sys/sys/param.h

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Fri Jun 13 08:44:03 2014	(r267439)
+++ head/lib/Makefile	Fri Jun 13 08:53:49 2014	(r267440)
@@ -136,6 +136,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libz \
 	${_atf} \
 	${_clang} \
+	${_cuse} \
 	${_tests}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
@@ -172,6 +173,10 @@ _libcasper=	libcasper
 _clang=		clang
 .endif
 
+.if ${MK_CUSE} != "no"
+_cuse=		libcuse
+.endif
+
 .if ${MK_GPIB} != "no"
 _libgpib=	libgpib
 .endif

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri Jun 13 08:44:03 2014	(r267439)
+++ head/share/mk/src.opts.mk	Fri Jun 13 08:53:49 2014	(r267440)
@@ -68,6 +68,7 @@ __DEFAULT_YES_OPTIONS = \
     CROSS_COMPILER \
     CRYPT \
     CTM \
+    CUSE \
     CXX \
     DICT \
     DMAGENT \

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri Jun 13 08:44:03 2014	(r267439)
+++ head/sys/modules/Makefile	Fri Jun 13 08:53:49 2014	(r267440)
@@ -82,6 +82,7 @@ SUBDIR=	\
 	${_ct} \
 	${_ctau} \
 	ctl \
+	cuse \
 	${_cxgb} \
 	${_cxgbe} \
 	${_cyclic} \

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Fri Jun 13 08:44:03 2014	(r267439)
+++ head/sys/sys/param.h	Fri Jun 13 08:53:49 2014	(r267440)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100022	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100023	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,