From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 28 Mar 2006 18:21:42 +0000 (+0000)
Subject: update to 2.5.2 to fix compile issue
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b8164e5fefc67a96b5279392aefba8846e17e8e;p=openwrt%2Fstaging%2Fadrian.git

update to 2.5.2 to fix compile issue

SVN-Revision: 3527
---

diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile
index 7f3572e90d..646b9d22ec 100644
--- a/openwrt/package/fuse/Makefile
+++ b/openwrt/package/fuse/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/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/openwrt/target/linux/package/fuse/Makefile b/openwrt/target/linux/package/fuse/Makefile
index b9a57d002d..e9922bcd32 100644
--- a/openwrt/target/linux/package/fuse/Makefile
+++ b/openwrt/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/openwrt/target/linux/package/fuse/patches/101-kmod_build.patch b/openwrt/target/linux/package/fuse/patches/101-kmod_build.patch
index 9d4a666e28..feed52aef3 100644
--- a/openwrt/target/linux/package/fuse/patches/101-kmod_build.patch
+++ b/openwrt/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