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

diff --git a/ChangeLog b/ChangeLog
index 942661c7084fe265e681f6508dd3e6e97d4b9ada..3564ec1650a31d9420c72652b18a6cf54d82f923 100644 (file)
--- a/ChangeLog
+++ b/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:

diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/arch/alpha/modules_load
+++ b/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"
+

diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..67b9a48168990031b7ed5390bc3c26a4b54f8879 100644 (file)
--- a/arch/ia64/modules_load
+++ b/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"

diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/arch/mips/modules_load
+++ b/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"
+

diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/arch/parisc/modules_load
+++ b/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"
+

diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..67b9a48168990031b7ed5390bc3c26a4b54f8879 100644 (file)
--- a/arch/parisc64/modules_load
+++ b/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"

diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/arch/ppc/modules_load
+++ b/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"
+

diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..67b9a48168990031b7ed5390bc3c26a4b54f8879 100644 (file)
--- a/arch/ppc64/modules_load
+++ b/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"

diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/arch/sparc/modules_load
+++ b/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"
+

diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..67b9a48168990031b7ed5390bc3c26a4b54f8879 100644 (file)
--- a/arch/sparc64/modules_load
+++ b/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"

diff --git a/arch/um/modules_load b/arch/um/modules_load
index f1599177a5b9383019e1028053d32ff0603d586d..309421d10e607ae16059264255525d4789833bc7 100644 (file)
--- a/arch/um/modules_load
+++ b/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"
+

diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/arch/x86/modules_load
+++ b/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"
+

diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..67b9a48168990031b7ed5390bc3c26a4b54f8879 100644 (file)
--- a/arch/x86_64/modules_load
+++ b/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"

diff --git a/defaults/modules_load b/defaults/modules_load
index 0e798582abc08e58a31ee03c12ef5d872612ab95..2e93dceb5ddb495bbddfb29d2b56ca37d2b12970 100644 (file)
--- a/defaults/modules_load
+++ b/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"
+

diff --git a/gen_compile.sh b/gen_compile.sh
index 2550b0762820777939b2b6ca652cb012fec5b11c..d9083a7e7006abb6e2c3c685cafc1d685cb81033 100644 (file)
--- a/gen_compile.sh
+++ b/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" ] ||
-                       gen_die 'libfuse.so does not exist!'
-               strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
-                       gen_die 'Could not strip libfuse.so!'
-               cd "${TEMP}/${FUSE_DIR}/lib/.libs"
-               tar -cjf "${FUSE_BINCACHE}" libfuse*so* ||
-                       gen_die 'Could not create fuse bincache!'
+
+               # Since we're linking statically against libfuse, we don't need to cache the .so
+#              print_info 1 'libfuse: >> Copying to cache...'
+#              [ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
+#                      gen_die 'libfuse.so does not exist!'
+#              strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
+#                      gen_die 'Could not strip libfuse.so!'
+#              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}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1773b39dc6fa6ef78f189357e57f5c8c32869c7d..5cc03b5c7ef682dd9514697938be42173c02ed7c 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -72,18 +72,18 @@ append_blkid(){
        rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null
 }
 
-append_fuse() {
-       if [ -d "${TEMP}/initramfs-fuse-temp" ]
-       then
-               rm -r "${TEMP}/initramfs-fuse-temp"
-       fi
-       cd ${TEMP}
-       mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
-       tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xjf "${FUSE_BINCACHE}"
-       cd "${TEMP}/initramfs-fuse-temp/"
-       find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
-       rm -rf "${TEMP}/initramfs-fuse-temp" > /dev/null
-}
+#append_fuse() {
+#      if [ -d "${TEMP}/initramfs-fuse-temp" ]
+#      then
+#              rm -r "${TEMP}/initramfs-fuse-temp"
+#      fi
+#      cd ${TEMP}
+#      mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
+#      tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xjf "${FUSE_BINCACHE}"
+#      cd "${TEMP}/initramfs-fuse-temp/"
+#      find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+#      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}"

diff --git a/genkernel b/genkernel
index 3659d93cf143fd5386ce4f9a3ee5171b3d30a810..0d4b77d52692e38982b0867d383862a68939630f 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -302,7 +302,6 @@ then
                compile_busybox
        fi
 
-       compile_fuse
        compile_unionfs_fuse
     
        # Compile initramfs