From 0a49020502654605b7c4bc6f2eb2e745998914af Mon Sep 17 00:00:00 2001 From: jow Date: Thu, 11 Jun 2009 02:09:53 +0000 Subject: [package] fuse24: introduce fuse package for brcm-2.4 (#5186) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16411 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/fuse24/patches/101-kmod_build.patch | 46 ++++++++++++++++ package/fuse24/patches/102-no_depmod.patch | 15 ++++++ package/fuse24/patches/111-uclibc_changes.patch | 16 ++++++ package/fuse24/patches/112-no_break_on_mknod.patch | 12 +++++ package/fuse24/patches/113-DCACHE_BUG.patch | 63 ++++++++++++++++++++++ 5 files changed, 152 insertions(+) create mode 100644 package/fuse24/patches/101-kmod_build.patch create mode 100644 package/fuse24/patches/102-no_depmod.patch create mode 100644 package/fuse24/patches/111-uclibc_changes.patch create mode 100644 package/fuse24/patches/112-no_break_on_mknod.patch create mode 100644 package/fuse24/patches/113-DCACHE_BUG.patch (limited to 'package/fuse24/patches') diff --git a/package/fuse24/patches/101-kmod_build.patch b/package/fuse24/patches/101-kmod_build.patch new file mode 100644 index 000000000..e541d4714 --- /dev/null +++ b/package/fuse24/patches/101-kmod_build.patch @@ -0,0 +1,46 @@ +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 @@ + + ifeq ($(majver), 2.4) + +-CC = gcc +-LD = ld +-CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe @KERNELCFLAGS@ +-CPPFLAGS = -I@kernelsrc@/include -I. -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"$(VERSION)\" @KERNELCPPFLAGS@ +- + fuse_objs = dev.o dir.o file.o inode.o compat/parser.o + +-SUFFIXES = .c .o .s +- +-all-spec: fuse.o +- +-.c.o: +- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ +- +-fuse.o: $(fuse_objs) +- $(LD) -r -o fuse.o $(fuse_objs) +- + fuse_headers = fuse_i.h fuse_kernel.h + + dev.o: $(fuse_headers) +@@ -78,6 +63,18 @@ + file.o: $(fuse_headers) + inode.o: $(fuse_headers) + ++EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\" ++ ++O_TARGET := fuse.o ++ ++obj-y := $(fuse_objs) ++obj-m := $(O_TARGET) ++ ++-include $(TOPDIR)/Rules.make ++ ++all-spec: ++ $(MAKE) -C @kernelsrc@ TOPDIR=@kernelsrc@ SUBDIRS=$(PWD) modules ++ + else + + EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\" diff --git a/package/fuse24/patches/102-no_depmod.patch b/package/fuse24/patches/102-no_depmod.patch new file mode 100644 index 000000000..ea9539a20 --- /dev/null +++ b/package/fuse24/patches/102-no_depmod.patch @@ -0,0 +1,15 @@ +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 @@ + install-y: all + $(mkdir_p) $(DESTDIR)$(fusemoduledir) + $(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule) +- -/sbin/depmod -a + + uninstall-y: + rm -f $(DESTDIR)$(fusemoduledir)/$(fusemodule) +- -/sbin/depmod -a + + clean: + -rm -f $(fusemodule) *.o .*.cmd *.mod.c *.ko *.s */*.o diff --git a/package/fuse24/patches/111-uclibc_changes.patch b/package/fuse24/patches/111-uclibc_changes.patch new file mode 100644 index 000000000..69730758e --- /dev/null +++ b/package/fuse24/patches/111-uclibc_changes.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000..96ed70f29 --- /dev/null +++ b/package/fuse24/patches/112-no_break_on_mknod.patch @@ -0,0 +1,12 @@ +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 @@ + install-exec-hook: + -chown root $(DESTDIR)$(bindir)/fusermount + -chmod u+s $(DESTDIR)$(bindir)/fusermount +- @if test ! -e $(DESTDIR)/dev/fuse; then \ ++ -@if test ! -e $(DESTDIR)/dev/fuse; then \ + $(mkdir_p) $(DESTDIR)/dev; \ + echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \ + mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \ diff --git a/package/fuse24/patches/113-DCACHE_BUG.patch b/package/fuse24/patches/113-DCACHE_BUG.patch new file mode 100644 index 000000000..fdfbfef51 --- /dev/null +++ b/package/fuse24/patches/113-DCACHE_BUG.patch @@ -0,0 +1,63 @@ +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 @@ + { + unsigned long offset; + int err; ++#ifdef DCACHE_BUG ++ struct vm_area_struct *vma; ++#endif + + unlock_request(cs->req); + fuse_copy_finish(cs); +@@ -523,14 +526,22 @@ + cs->nr_segs --; + } + down_read(¤t->mm->mmap_sem); ++#ifndef DCACHE_BUG + err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0, + &cs->pg, NULL); ++#else ++ err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0, ++ &cs->pg, &vma); ++#endif + up_read(¤t->mm->mmap_sem); + if (err < 0) + return err; + BUG_ON(err != 1); + offset = cs->addr % PAGE_SIZE; + cs->mapaddr = kmap_atomic(cs->pg, KM_USER0); ++#ifdef DCACHE_BUG ++ r4k_flush_cache_page(vma, cs->addr); ++#endif + cs->buf = cs->mapaddr + offset; + cs->len = min(PAGE_SIZE - offset, cs->seglen); + cs->seglen -= cs->len; +@@ -545,6 +556,11 @@ + { + unsigned ncpy = min(*size, cs->len); + if (val) { ++#ifdef DCACHE_BUG ++ // patch from mailing list, it is very important, otherwise, ++ // can't mount, or ls mount point will hang ++ flush_cache_all(); ++#endif + 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 +@@ -45,6 +45,10 @@ + # endif + #endif + ++//#if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) ++#define DCACHE_BUG ++//#endif ++ + #include "config.h" + #ifndef KERNEL_2_6 + # include + -- cgit v1.2.3