update fuse to 2.6.1 (fix build on 2.6.19), remove kmod_build patch needed for 2...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5799 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index fda8f1c..d310e92 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse

-PKG_VERSION:=2.5.3
+PKG_VERSION:=2.6.1

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)

-PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
+PKG_MD5SUM:=13e1873086a1d7a95f470bbc7428c528

 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)


@@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE
 
 define Package/fuse/Default
   TITLE:=FUSE

+  DEPENDS:=@LINUX_2_6

   DESCRIPTION:=\
        FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/
   DESCRIPTION:=\
        FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/

diff --git a/package/fuse/patches/101-kmod_build.patch b/package/fuse/patches/101-kmod_build.patch
index e541d47..e69de29 100644 (file)
--- a/package/fuse/patches/101-kmod_build.patch
+++ b/package/fuse/patches/101-kmod_build.patch
@@ -1,46 +0,0 @@
-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)\"