projects
/
openwrt
/
staging
/
wigyori.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd62286
)
disable fuse kernel compilation module, all versions that we have have it mainline...
author
Florian Fainelli
<florian@openwrt.org>
Fri, 31 Jul 2009 10:49:46 +0000
(10:49 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Fri, 31 Jul 2009 10:49:46 +0000
(10:49 +0000)
SVN-Revision: 17059
package/fuse/Makefile
patch
|
blob
|
history
diff --git
a/package/fuse/Makefile
b/package/fuse/Makefile
index d5e108685f2735a53ebdc837567c91745a13a348..152c5402ddd5e9083f7520f59c0ad0de06c86ad4 100644
(file)
--- a/
package/fuse/Makefile
+++ b/
package/fuse/Makefile
@@
-10,7
+10,7
@@
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.7.4
PKG_NAME:=fuse
PKG_VERSION:=2.7.4
-PKG_RELEASE:=
1
+PKG_RELEASE:=
2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@@
-85,23
+85,12
@@
CONFIGURE_ARGS += \
--with-kernel="$(LINUX_DIR)" \
--disable-mtab
--with-kernel="$(LINUX_DIR)" \
--disable-mtab
-# This section is disabled; since kernel 2.6.14 the fuse module is officially
-# part of the kernel. The following enables this fuse packages kernel module
-# instead of the kernel's, if the kernel is younger than 2.6.25.
-# Generally it is better to use the kernel's module. Because it is DCACHE BUG
-# patched and from fuse 2.8.0 on it will be removed from the fuse package
-# anyway.
+# Since kernel 2.6.14 the fuse module is officially part of the kernel.
+# Generally it is better to use the kernel's module. Because it is patched
+# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx)
+# and from fuse 2.8.0 on it will be removed from the fuse package anyway.
#
#
-#ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.25)),1)
-# define KernelPackage/fuse/2.6
-# KCONFIG:=
-# FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
-# endef
-#
-# CONFIGURE_ARGS += --enable-kernel-module
-#else
-# CONFIGURE_ARGS += --disable-kernel-module
-#endif
+CONFIGURE_ARGS += --disable-kernel-module
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \