Fix the mac80211 installation, remove the in-kernel mac80211 package, thanks to Danie...

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index d4641c1..afdaa77 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,16 +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.6.3
+PKG_VERSION:=2.6.5

 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:=3f4f5d07d12dedc0a3fd23472171fe94
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=66bd30503df55a87b9868835ca5a45bc

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -45,13 +41,14 @@ endef
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)

-  TITLE+= (kernel module)

   DEPENDS:=@LINUX_2_6
   DEPENDS:=@LINUX_2_6

+  TITLE+= (kernel module)

   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE kernel module.
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE kernel module.

-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)

   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)

+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  AUTOLOAD:=$(call AutoLoad,80,fuse)

 endef
 
 define Package/libfuse
 endef
 
 define Package/libfuse


@@ -65,6 +62,9 @@ define Package/libfuse
        This package contains the FUSE shared library, needed by other programs.
 endef
 
        This package contains the FUSE shared library, needed by other programs.
 endef
 

+CONFIGURE_VARS += \
+        kernsrcver="$(LINUX_VERSION)"
+

 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \


@@ -93,6 +93,8 @@ define Build/Compile
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

+               AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
+               EXTRA_DIST="" \

                all install
 endef
 
                all install
 endef