Some fixes for fuse24.

Because sshfs expects character device to be /dev/fuse instead of /dev/misc/fuse, sshfs fails.
This patch creates fuse device at /dev/fuse instead, also for compatibility the postinstall script (only executed when manually installed per opkg) creates /dev/misc/fuse
added the dcache enabled kernel message to fuse24

Closes #5333

SVN-Revision: 16447

diff --git a/package/fuse24/Makefile b/package/fuse24/Makefile
index ca2076dde6b42411731b6e97c5b0e09ae351c2da..9f49d183ee5d616b9d0aecee92fa75fc454e3cfa 100644 (file)
--- a/package/fuse24/Makefile
+++ b/package/fuse24/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=fuse
 
 PKG_VERSION:=2.5.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
 
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@@ -48,7 +48,7 @@ endef
 
 define KernelPackage/fuse24/install
        $(call $(Package/kmod-fuse24/install))
-       echo mknod /dev/fuse -m 0666 c 10 229 >> $(1)/CONTROL/postinst
+       echo '[ ! -d /dev/misc ]&& umask 022 && mkdir /dev/misc ; mknod /dev/misc/fuse -m 0666 c 10 229' >> $(1)/CONTROL/postinst
 endef
 
 define Build/Configure
@@ -107,8 +107,6 @@ endef
 define Build/InstallDev
        mkdir -p $(1)/usr/include
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
-#      mkdir -p $(1)/usr/lib
-#      $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/
        mkdir -p $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
        $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc

diff --git a/package/fuse24/patches/101-kmod_build.patch b/package/fuse24/patches/101-kmod_build.patch
index e541d471425f9a9ac4de58160001cfcdbb2f3b0e..08cf0a8f73524306964599ed1459de12e6c6fdca 100644 (file)
--- a/package/fuse24/patches/101-kmod_build.patch
+++ b/package/fuse24/patches/101-kmod_build.patch
@@ -1,7 +1,6 @@
-diff -Nur fuse-2.5.2/kernel/Makefile.in fuse-2.5.2.patched/kernel/Makefile.in
---- fuse-2.5.2/kernel/Makefile.in      2006-02-02 18:04:52.000000000 +0100
-+++ fuse-2.5.2.patched/kernel/Makefile.in      2006-03-28 20:17:13.000000000 +0200
-@@ -54,23 +54,8 @@
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -54,23 +54,8 @@ distdir: $(DISTFILES) $(COMPATDISTFILES)
  
  ifeq ($(majver), 2.4)
  
@@ -25,7 +24,7 @@ diff -Nur fuse-2.5.2/kernel/Makefile.in fuse-2.5.2.patched/kernel/Makefile.in
  fuse_headers = fuse_i.h fuse_kernel.h
  
  dev.o: $(fuse_headers)
-@@ -78,6 +63,18 @@
+@@ -78,6 +63,18 @@ dir.o: $(fuse_headers)
  file.o: $(fuse_headers)
  inode.o: $(fuse_headers)
  

diff --git a/package/fuse24/patches/102-no_depmod.patch b/package/fuse24/patches/102-no_depmod.patch
index ea9539a2006cffef923dd87d50df03a77aaeeeed..e0a14490ce6282a6568879f3cc46bd87f8c31746 100644 (file)
--- a/package/fuse24/patches/102-no_depmod.patch
+++ b/package/fuse24/patches/102-no_depmod.patch
@@ -1,7 +1,6 @@
-diff -ruN fuse-2.5.3-old/kernel/Makefile.in fuse-2.5.3-new/kernel/Makefile.in
---- fuse-2.5.3-old/kernel/Makefile.in  2006-06-17 00:04:06.000000000 +0200
-+++ fuse-2.5.3-new/kernel/Makefile.in  2006-06-17 00:08:44.000000000 +0200
-@@ -31,11 +31,9 @@
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -31,11 +31,9 @@ all-y: all-spec
  install-y: all
        $(mkdir_p) $(DESTDIR)$(fusemoduledir)
        $(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule)

diff --git a/package/fuse24/patches/111-uclibc_changes.patch b/package/fuse24/patches/111-uclibc_changes.patch
index 69730758e67a5ecb9ed702c9e1b2a6610c894d43..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/package/fuse24/patches/111-uclibc_changes.patch
+++ b/package/fuse24/patches/111-uclibc_changes.patch
@@ -1,16 +0,0 @@
-diff -ruw fuse-2.4.0/util/fusermount.c.org fuse-2.4.0/util/fusermount.c
---- fuse-2.4.0/util/fusermount.c.org   2005-10-14 11:34:06.000000000 +0200
-+++ fuse-2.4.0/util/fusermount.c       2005-10-14 11:56:26.000000000 +0200
-@@ -42,7 +42,12 @@
- #define FUSE_COMMFD_ENV         "_FUSE_COMMFD"
- 
- #define FUSE_DEV_OLD "/proc/fs/fuse/dev"
-+#ifdef __UCLIBC__
-+/* /dev is mounted as devfs in OpenWRT, and device is created here */
-+#define FUSE_DEV_NEW "/dev/misc/fuse"
-+#else
- #define FUSE_DEV_NEW "/dev/fuse"
-+#endif
- #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version"
- #define FUSE_CONF "/etc/fuse.conf"
- 

diff --git a/package/fuse24/patches/112-no_break_on_mknod.patch b/package/fuse24/patches/112-no_break_on_mknod.patch
index 96ed70f2917e03d976474aa0f87735a2db783198..1c1e466fa99e22697d81983498cce1371838f23a 100644 (file)
--- a/package/fuse24/patches/112-no_break_on_mknod.patch
+++ b/package/fuse24/patches/112-no_break_on_mknod.patch
@@ -1,7 +1,6 @@
-diff -ruN fuse-2.4.1-old/util/Makefile.in fuse-2.4.1-new/util/Makefile.in
---- fuse-2.4.1-old/util/Makefile.in    2005-10-17 12:29:20.000000000 +0200
-+++ fuse-2.4.1-new/util/Makefile.in    2005-10-19 17:11:13.000000000 +0200
-@@ -445,7 +445,7 @@
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -453,7 +453,7 @@ uninstall-am: uninstall-binPROGRAMS unin
  install-exec-hook:
        -chown root $(DESTDIR)$(bindir)/fusermount
        -chmod u+s $(DESTDIR)$(bindir)/fusermount

diff --git a/package/fuse24/patches/113-DCACHE_BUG.patch b/package/fuse24/patches/113-DCACHE_BUG.patch
index fdfbfef51159d219c4adff19b5f1c22bcd23f180..da0d27cd2f654fb871ef5069edc8875687dc0ef6 100644 (file)
--- a/package/fuse24/patches/113-DCACHE_BUG.patch
+++ b/package/fuse24/patches/113-DCACHE_BUG.patch
@@ -1,7 +1,6 @@
-diff -ruN fuse-2.5.3.orig/kernel/dev.c fuse-2.5.3/kernel/dev.c
---- fuse-2.5.3.orig/kernel/dev.c       2006-02-02 19:04:52.000000000 +0200
-+++ fuse-2.5.3/kernel/dev.c    2008-10-23 10:27:53.000000000 +0300
-@@ -512,6 +512,9 @@
+--- a/kernel/dev.c
++++ b/kernel/dev.c
+@@ -512,6 +512,9 @@ static int fuse_copy_fill(struct fuse_co
  {
        unsigned long offset;
        int err;
@@ -11,7 +10,7 @@ diff -ruN fuse-2.5.3.orig/kernel/dev.c fuse-2.5.3/kernel/dev.c
  
        unlock_request(cs->req);
        fuse_copy_finish(cs);
-@@ -523,14 +526,22 @@
+@@ -523,14 +526,22 @@ static int fuse_copy_fill(struct fuse_co
                cs->nr_segs --;
        }
        down_read(&current->mm->mmap_sem);
@@ -34,7 +33,7 @@ diff -ruN fuse-2.5.3.orig/kernel/dev.c fuse-2.5.3/kernel/dev.c
        cs->buf = cs->mapaddr + offset;
        cs->len = min(PAGE_SIZE - offset, cs->seglen);
        cs->seglen -= cs->len;
-@@ -545,6 +556,11 @@
+@@ -545,6 +556,11 @@ static inline int fuse_copy_do(struct fu
  {
        unsigned ncpy = min(*size, cs->len);
        if (val) {
@@ -46,9 +45,8 @@ diff -ruN fuse-2.5.3.orig/kernel/dev.c fuse-2.5.3/kernel/dev.c
                if (cs->write)
                        memcpy(cs->buf, *val, ncpy);
                else
-diff -ruN fuse-2.5.3.orig/kernel/fuse_i.h fuse-2.5.3/kernel/fuse_i.h
---- fuse-2.5.3.orig/kernel/fuse_i.h    2006-02-02 19:04:52.000000000 +0200
-+++ fuse-2.5.3/kernel/fuse_i.h 2008-10-22 18:03:50.000000000 +0300
+--- a/kernel/fuse_i.h
++++ b/kernel/fuse_i.h
 @@ -45,6 +45,10 @@
  #  endif
  #endif
@@ -60,4 +58,16 @@ diff -ruN fuse-2.5.3.orig/kernel/fuse_i.h fuse-2.5.3/kernel/fuse_i.h
  #include "config.h"
  #ifndef KERNEL_2_6
  #  include <linux/config.h>
-
+--- a/kernel/inode.c
++++ b/kernel/inode.c
+@@ -739,6 +739,10 @@ static int __init fuse_init(void)
+       printk("fuse distribution version: %s\n", FUSE_VERSION);
+ #endif
+ 
++#ifdef DCACHE_BUG
++printk("fuse init: DCACHE_BUG enabled\n");
++#endif
++
+       spin_lock_init(&fuse_lock);
+       res = fuse_fs_init();
+       if (res)