From owner-svn-src-head@FreeBSD.ORG  Fri Jun 13 08:53:51 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3DC422C1;
 Fri, 13 Jun 2014 08:53:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 10D1D221B;
 Fri, 13 Jun 2014 08:53:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5D8ro5H084167;
 Fri, 13 Jun 2014 08:53:50 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5D8rowf084163;
 Fri, 13 Jun 2014 08:53:50 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201406130853.s5D8rowf084163@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 13 Jun 2014 08:53:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267440 - in head: lib share/mk sys/modules sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jun 2014 08:53:51 -0000

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,