From owner-svn-src-projects@FreeBSD.ORG  Thu Jul 12 22:55:49 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8682C1065676;
	Thu, 12 Jul 2012 22:55:49 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 71D708FC1E;
	Thu, 12 Jul 2012 22:55:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6CMtnJn033667;
	Thu, 12 Jul 2012 22:55:49 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6CMtn5p033663;
	Thu, 12 Jul 2012 22:55:49 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201207122255.q6CMtn5p033663@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 12 Jul 2012 22:55:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238410 - in projects/fuse/sys: conf modules
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jul 2012 22:55:49 -0000

Author: attilio
Date: Thu Jul 12 22:55:48 2012
New Revision: 238410
URL: http://svn.freebsd.org/changeset/base/238410

Log:
  - Make the ability to specify the option FUSE directly in the kernel
    config file and have FUSE be part of the kernel static image.
  - Correctly add fuse among the building modules

Modified:
  projects/fuse/sys/conf/NOTES
  projects/fuse/sys/conf/options
  projects/fuse/sys/modules/Makefile

Modified: projects/fuse/sys/conf/NOTES
==============================================================================
--- projects/fuse/sys/conf/NOTES	Thu Jul 12 22:54:32 2012	(r238409)
+++ projects/fuse/sys/conf/NOTES	Thu Jul 12 22:55:48 2012	(r238410)
@@ -1000,6 +1000,7 @@ options 	NFSCLIENT		#Network File System
 # The rest are optional:
 options 	CD9660			#ISO 9660 filesystem
 options 	FDESCFS			#File descriptor filesystem
+options 	FUSE			#FUSE support module
 options 	HPFS			#OS/2 File system
 options 	MSDOSFS			#MS DOS File System (FAT, FAT32)
 options 	NFSSERVER		#Network File System server

Modified: projects/fuse/sys/conf/options
==============================================================================
--- projects/fuse/sys/conf/options	Thu Jul 12 22:54:32 2012	(r238409)
+++ projects/fuse/sys/conf/options	Thu Jul 12 22:55:48 2012	(r238410)
@@ -210,6 +210,7 @@ CD9660		opt_dontuse.h
 CODA		opt_dontuse.h
 EXT2FS		opt_dontuse.h
 FDESCFS		opt_dontuse.h
+FUSE		opt_dontuse.h
 FFS		opt_dontuse.h
 HPFS		opt_dontuse.h
 MSDOSFS		opt_dontuse.h

Modified: projects/fuse/sys/modules/Makefile
==============================================================================
--- projects/fuse/sys/modules/Makefile	Thu Jul 12 22:54:32 2012	(r238409)
+++ projects/fuse/sys/modules/Makefile	Thu Jul 12 22:55:48 2012	(r238410)
@@ -109,6 +109,7 @@ SUBDIR=	\
 	filemon \
 	firewire \
 	firmware \
+	fuse \
 	${_fxp} \
 	gem \
 	geom \