diff options
Diffstat (limited to 'package/fuse24')
| -rw-r--r-- | package/fuse24/Makefile | 118 | ||||
| -rw-r--r-- | package/fuse24/files/fuse24.init | 10 | ||||
| -rw-r--r-- | package/fuse24/patches/101-kmod_build.patch | 45 | ||||
| -rw-r--r-- | package/fuse24/patches/102-no_depmod.patch | 14 | ||||
| -rw-r--r-- | package/fuse24/patches/112-no_break_on_mknod.patch | 11 | ||||
| -rw-r--r-- | package/fuse24/patches/113-DCACHE_BUG.patch | 73 |
6 files changed, 0 insertions, 271 deletions
diff --git a/package/fuse24/Makefile b/package/fuse24/Makefile deleted file mode 100644 index 0604bd3a8..000000000 --- a/package/fuse24/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=fuse - -PKG_VERSION:=2.5.3 -PKG_RELEASE:=3 -PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c - -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - -include $(INCLUDE_DIR)/package.mk - -define Package/fuse24/Default - TITLE:=FUSE for kernel 2.4 - DEPENDS:=@LINUX_2_4 - URL:=http://fuse.sourceforge.net/ -endef - -define Package/fuse24/Default/description - FUSE for kernel 2.4 (Filesystem in UserSpacE) contains only the kernel module. - The libraries and utilities can be compiled from a recent FUSE version (package fuse). - For details see: - http://apps.sourceforge.net/mediawiki/fuse/index.php?title=FAQ#What_version_of_FUSE_do_I_need_to_use_FUSE_with_Linux_2.4.3F -endef - -define KernelPackage/fuse24 -$(call Package/fuse24/Default) - SUBMENU:=Filesystems - DEPENDS:=@LINUX_2_4 - TITLE+= (kernel module) - FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,80,fuse) -endef - -define KernelPackage/fuse24/description -$(call Package/fuse24/Default/description) - This package contains the FUSE kernel 2.4 module. -endef - -define KernelPackage/fuse24/install - $(call $(Package/kmod-fuse24/install)) - $(INSTALL_DIR) $(1)/etc/init.d - # symlinks /dev/misc/fuse to /dev/fuse on startup - $(INSTALL_BIN) ./files/fuse24.init $(1)/etc/init.d/fuse24 -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - rm -rf config.{cache,status} ; \ - touch configure.in ; \ - touch aclocal.m4 ; \ - touch Makefile.in ; \ - touch include/config.h.in ; \ - touch configure ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - --disable-rpath \ - --enable-kernel-module \ - --disable-example \ - --disable-auto-modprobe \ - --with-kernel=$(LINUX_DIR) \ - --disable-mtab \ - --disable-lib \ - --disable-util \ - ); -endef - -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -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/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 - $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc -endef - -$(eval $(call KernelPackage,fuse24)) diff --git a/package/fuse24/files/fuse24.init b/package/fuse24/files/fuse24.init deleted file mode 100644 index 519db20a4..000000000 --- a/package/fuse24/files/fuse24.init +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2009 OpenWrt.org -START=15 - -start() { - if ls /lib/modules/$(uname -r)/fuse.* > /dev/null 2>&1; then - [ ! -d /dev/misc ] && umask 022 && mkdir /dev/misc; - ln -s /dev/fuse /dev/misc/; - fi -} diff --git a/package/fuse24/patches/101-kmod_build.patch b/package/fuse24/patches/101-kmod_build.patch deleted file mode 100644 index 08cf0a8f7..000000000 --- a/package/fuse24/patches/101-kmod_build.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/kernel/Makefile.in -+++ b/kernel/Makefile.in -@@ -54,23 +54,8 @@ distdir: $(DISTFILES) $(COMPATDISTFILES) - - 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 @@ dir.o: $(fuse_headers) - 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 deleted file mode 100644 index e0a14490c..000000000 --- a/package/fuse24/patches/102-no_depmod.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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) -- -/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/112-no_break_on_mknod.patch b/package/fuse24/patches/112-no_break_on_mknod.patch deleted file mode 100644 index 1c1e466fa..000000000 --- a/package/fuse24/patches/112-no_break_on_mknod.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -- @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 deleted file mode 100644 index da0d27cd2..000000000 --- a/package/fuse24/patches/113-DCACHE_BUG.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- 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; -+#ifdef DCACHE_BUG -+ struct vm_area_struct *vma; -+#endif - - unlock_request(cs->req); - fuse_copy_finish(cs); -@@ -523,14 +526,22 @@ static int fuse_copy_fill(struct fuse_co - 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 @@ static inline int fuse_copy_do(struct fu - { - 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 ---- a/kernel/fuse_i.h -+++ b/kernel/fuse_i.h -@@ -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 <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) |