From: Andrew Gaffney Date: Fri, 14 Nov 2008 03:27:00 +0000 (-0600) Subject: Add fuse to MODULES_FS X-Git-Tag: v3.4.10.902~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd24098f082c1b41d8109a3de595bb141337f392;p=genkernel.git 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 942661c..3564ec1 100644 --- 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 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 +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 0e79858..2e93dce 100644 --- 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 0e79858..67b9a48 100644 --- 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 0e79858..2e93dce 100644 --- 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 0e79858..2e93dce 100644 --- 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 0e79858..67b9a48 100644 --- 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 0e79858..2e93dce 100644 --- 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 0e79858..67b9a48 100644 --- 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 0e79858..2e93dce 100644 --- 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 0e79858..67b9a48 100644 --- 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 f159917..309421d 100644 --- 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 0e79858..2e93dce 100644 --- 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 0e79858..67b9a48 100644 --- 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 0e79858..2e93dce 100644 --- 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 2550b07..d9083a7 100644 --- 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 1773b39..5cc03b5 100644 --- 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 3659d93..0d4b77d 100755 --- a/genkernel +++ b/genkernel @@ -302,7 +302,6 @@ then compile_busybox fi - compile_fuse compile_unionfs_fuse # Compile initramfs