Add fuse to MODULES_FS

Remove direct calls to compile_fuse() and append_fuse()
Disable bincache for fuse, since we don't need any files at runtime from it

ChangeLog

@@ -2,6 +2,17 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/modules_load,
+  arch/ia64/modules_load, arch/mips/modules_load, arch/parisc/modules_load,
+  arch/parisc64/modules_load, arch/ppc/modules_load,
+  arch/ppc64/modules_load, arch/sparc/modules_load,
+  arch/sparc64/modules_load, arch/um/modules_load, arch/x86/modules_load,
+  arch/x86_64/modules_load, defaults/modules_load, gen_compile.sh,
+  gen_initramfs.sh, genkernel:
+  Add fuse to MODULES_FS Remove direct calls to compile_fuse() and
+  append_fuse() Disable bincache for fuse, since we don't need any files at
+  runtime from it
+
   14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org>
   +patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff,
   -patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff:

arch/alpha/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/ia64/modules_load

@@ -22,4 +22,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"

arch/mips/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/parisc/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/parisc64/modules_load

@@ -22,4 +22,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"

arch/ppc/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/ppc64/modules_load

@@ -22,4 +22,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"

arch/sparc/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/sparc64/modules_load

@@ -22,4 +22,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"

arch/um/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/x86/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

arch/x86_64/modules_load

@@ -22,4 +22,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"

defaults/modules_load

@@ -22,4 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 
 # Filesystems
-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse"
+

gen_compile.sh

@@ -537,14 +537,16 @@ compile_fuse() {
 			gen_die 'Configuring fuse failed!'
 		print_info 1 'fuse: >> Compiling...'
 		MAKE=${UTILS_MAKE} compile_generic "" ""
-		print_info 1 'libfuse: >> Copying to cache...'
+
-		[ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
+		# Since we're linking statically against libfuse, we don't need to cache the .so
-			gen_die 'libfuse.so does not exist!'
+#		print_info 1 'libfuse: >> Copying to cache...'
-		strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
+#		[ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
-			gen_die 'Could not strip libfuse.so!'
+#			gen_die 'libfuse.so does not exist!'
-		cd "${TEMP}/${FUSE_DIR}/lib/.libs"
+#		strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
-		tar -cjf "${FUSE_BINCACHE}" libfuse*so* ||
+#			gen_die 'Could not strip libfuse.so!'
-			gen_die 'Could not create fuse bincache!'
+#		cd "${TEMP}/${FUSE_DIR}/lib/.libs"
+#		tar -cjf "${FUSE_BINCACHE}" libfuse*so* ||
+#			gen_die 'Could not create fuse bincache!'
 
 		cd "${TEMP}"
 #		rm -rf "${FUSE_DIR}" > /dev/null
@@ -554,6 +556,10 @@ compile_fuse() {
 compile_unionfs_fuse() {
 	if [ ! -f "${UNIONFS_FUSE_BINCACHE}" ]
 	then
+
+		# We'll call compile_fuse() from here, since it's not needed directly by anything else
+		compile_fuse
+
 		[ ! -f "${UNIONFS_FUSE_SRCTAR}" ] &&
 			gen_die "Could not find unionfs-fuse source tarball: ${UNIONFS_FUSE_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"

gen_initramfs.sh

@@ -72,18 +72,18 @@ append_blkid(){
 	rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null
 }
 
-append_fuse() {
+#append_fuse() {
-	if [ -d "${TEMP}/initramfs-fuse-temp" ]
+#	if [ -d "${TEMP}/initramfs-fuse-temp" ]
-	then
+#	then
-		rm -r "${TEMP}/initramfs-fuse-temp"
+#		rm -r "${TEMP}/initramfs-fuse-temp"
-	fi
+#	fi
-	cd ${TEMP}
+#	cd ${TEMP}
-	mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
+#	mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
-	tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xjf "${FUSE_BINCACHE}"
+#	tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xjf "${FUSE_BINCACHE}"
-	cd "${TEMP}/initramfs-fuse-temp/"
+#	cd "${TEMP}/initramfs-fuse-temp/"
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+#	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
-	rm -rf "${TEMP}/initramfs-fuse-temp" > /dev/null
+#	rm -rf "${TEMP}/initramfs-fuse-temp" > /dev/null
-}
+#}
 
 append_unionfs_fuse() {
 	if [ -d "${TEMP}/initramfs-unionfs-fuse-temp" ]
@@ -505,7 +505,6 @@ create_initramfs() {
 
 	append_data 'blkid' "${DISKLABEL}"
 
-	append_data 'fuse'
 	append_data 'unionfs_fuse'
 
 	if isTrue "${SPLASH}"

genkernel

@@ -302,7 +302,6 @@ then
 		compile_busybox
 	fi
 
-	compile_fuse
 	compile_unionfs_fuse
     
 	# Compile initramfs