oops... wrong patch (unfixed typo)

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 5b94174..792f5e6 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -16,15 +16,12 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94
 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

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE

+  DEPENDS:=@LINUX_2_6

   DESCRIPTION:=\
        FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/
   DESCRIPTION:=\
        FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/


@@ -34,7 +31,7 @@ define Package/fuse-utils
   $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities

-  DEPENDS:=+libfuse +kmod-fuse
+  DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6

   TITLE+= (utilities)
   DESCRIPTION+=\\\
        \\\
   TITLE+= (utilities)
   DESCRIPTION+=\\\
        \\\


@@ -44,22 +41,16 @@ endef
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)

+  DEPENDS:=@LINUX_2_6

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

+  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
 
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef
 

-define KernelPackage/fuse/2.4 
-  FILES:=$(PKG_BUILD_DIR)/lib/fuse.$(LINUX_KMOD_SUFFIX) 
-endef 
-
-define KernelPackage/fuse/2.6
-  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
-endef
-

 define Package/libfuse
   $(call Package/fuse/Default)
   SECTION:=libs
 define Package/libfuse
   $(call Package/fuse/Default)
   SECTION:=libs


@@ -71,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 \