aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2006-03-28 18:21:42 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2006-03-28 18:21:42 +0000
commit539594b67971a62933dbda0253a268916d21630b (patch)
treedd8b377101a1cc2256ff87cdb9aecf57fcb0af0c /target
parent668097a8a0e20c1823b410afad0392ddb5b61741 (diff)
downloadupstream-539594b67971a62933dbda0253a268916d21630b.tar.gz
upstream-539594b67971a62933dbda0253a268916d21630b.tar.bz2
upstream-539594b67971a62933dbda0253a268916d21630b.zip
update to 2.5.2 to fix compile issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3527 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/package/fuse/Makefile4
-rw-r--r--target/linux/package/fuse/patches/101-kmod_build.patch28
2 files changed, 8 insertions, 24 deletions
diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile
index b9a57d002d..e9922bcd32 100644
--- a/target/linux/package/fuse/Makefile
+++ b/target/linux/package/fuse/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
include ../../rules.mk
PKG_NAME:=fuse
-PKG_VERSION:=2.4.1
+PKG_VERSION:=2.5.2
PKG_RELEASE:=1
-PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c
+PKG_MD5SUM:=ea565debe6c7486963bef05c45c50361
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/target/linux/package/fuse/patches/101-kmod_build.patch b/target/linux/package/fuse/patches/101-kmod_build.patch
index 9d4a666e28..feed52aef3 100644
--- a/target/linux/package/fuse/patches/101-kmod_build.patch
+++ b/target/linux/package/fuse/patches/101-kmod_build.patch
@@ -1,27 +1,13 @@
-diff -ruw fuse-2.3.0.org/kernel/Makefile.in fuse-2.3.0/kernel/Makefile.in
---- fuse-2.3.0.org/kernel/Makefile.in 2005-04-21 21:00:39.000000000 +0200
-+++ fuse-2.3.0/kernel/Makefile.in 2005-08-26 09:13:41.000000000 +0200
-@@ -31,11 +31,11 @@
- install-y: all
- $(mkdir_p) $(DESTDIR)$(fusemoduledir)
- $(INSTALL) -m 644 $(fusemodule) $(DESTDIR)$(fusemoduledir)/$(fusemodule)
-- -/sbin/depmod -a
-+# -/sbin/depmod -a
-
- uninstall-y:
- rm -f $(DESTDIR)$(fusemoduledir)/$(fusemodule)
-- -/sbin/depmod -a
-+# -/sbin/depmod -a
-
- clean:
- -rm -f $(fusemodule) *.o .*.cmd *.mod.c *.ko *.s */*.o
+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 -msoft-float
+-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
@@ -39,15 +25,13 @@ diff -ruw fuse-2.3.0.org/kernel/Makefile.in fuse-2.3.0/kernel/Makefile.in
fuse_headers = fuse_i.h fuse_kernel.h
dev.o: $(fuse_headers)
-@@ -78,6 +63,18 @@
+@@ -78,6 +63,16 @@
file.o: $(fuse_headers)
inode.o: $(fuse_headers)
+EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\"
+
-+O_TARGET := fuse.o
-+
-+obj-y := $(fuse_objs)
++obj-m := $(fuse_objs)
+obj-m := $(O_TARGET)
+
+-include $(TOPDIR)/Rules.make