qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-29 03:19:33 +02:00
Code

update to 2.5.2 to fix compile issue

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3527 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
wbx 2006-03-28 18:21:42 +00:00
parent 8bb07ec4ed
commit 22a1832e50
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openwrt/package/fuse/Makefile
View File

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fuse PKG_NAME:=fuse
PKG_VERSION:=2.4.1 PKG_VERSION:=2.5.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c PKG_MD5SUM:=ea565debe6c7486963bef05c45c50361
PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

4
openwrt/target/linux/package/fuse/Makefile
View File

@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
include ../../rules.mk include ../../rules.mk
PKG_NAME:=fuse PKG_NAME:=fuse
PKG_VERSION:=2.4.1 PKG_VERSION:=2.5.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c PKG_MD5SUM:=ea565debe6c7486963bef05c45c50361
PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

28
openwrt/target/linux/package/fuse/patches/101-kmod_build.patch
View File

@ -1,27 +1,13 @@
diff -ruw fuse-2.3.0.org/kernel/Makefile.in fuse-2.3.0/kernel/Makefile.in diff -Nur fuse-2.5.2/kernel/Makefile.in fuse-2.5.2.patched/kernel/Makefile.in
--- fuse-2.3.0.org/kernel/Makefile.in 2005-04-21 21:00:39.000000000 +0200 --- fuse-2.5.2/kernel/Makefile.in 2006-02-02 18:04:52.000000000 +0100
+++ fuse-2.3.0/kernel/Makefile.in 2005-08-26 09:13:41.000000000 +0200 +++ fuse-2.5.2.patched/kernel/Makefile.in 2006-03-28 20:17:13.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
@@ -54,23 +54,8 @@ @@ -54,23 +54,8 @@
ifeq ($(majver), 2.4) ifeq ($(majver), 2.4)
-CC = gcc -CC = gcc
-LD = ld -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@ -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 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 fuse_headers = fuse_i.h fuse_kernel.h
dev.o: $(fuse_headers) dev.o: $(fuse_headers)
@@ -78,6 +63,18 @@ @@ -78,6 +63,16 @@
file.o: $(fuse_headers) file.o: $(fuse_headers)
inode.o: $(fuse_headers) inode.o: $(fuse_headers)
+EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\" +EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\"
+ +
+O_TARGET := fuse.o +obj-m := $(fuse_objs)
+
+obj-y := $(fuse_objs)
+obj-m := $(O_TARGET) +obj-m := $(O_TARGET)
+ +
+-include $(TOPDIR)/Rules.make +-include $(TOPDIR)/Rules.make