backport acx100 2.6.24 fixes from SVN

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 42fe78c..8d280e1 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,62 +10,70 @@ 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.7.1

 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:=f95b4a238a3df5a92e9013ecb55c2c17

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE
   DEPENDS:=@LINUX_2_6
 
 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/
 endef
 
   URL:=http://fuse.sourceforge.net/
 endef
 

+define Package/fuse/Default/description
+ FUSE (Filesystem in UserSpacE)
+endef
+

 define Package/fuse-utils
 define Package/fuse-utils

-  $(call Package/fuse/Default)
+$(call Package/fuse/Default)

   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
   TITLE+= (utilities)
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
   TITLE+= (utilities)

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the FUSE utilities.
+  SUBMENU:=disc
+endef
+
+define Package/fuse-utils/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE utilities.

 endef
 
 define KernelPackage/fuse
 endef
 
 define KernelPackage/fuse

+$(call Package/fuse/Default)

   SUBMENU:=Filesystems
   SUBMENU:=Filesystems

-  $(call Package/fuse/Default)

   DEPENDS:=@LINUX_2_6
   TITLE+= (kernel module)
   DEPENDS:=@LINUX_2_6
   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)
   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
 
   AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef
 

+define Kernel/Package/fuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE kernel module.
+endef
+

 define Package/libfuse
 define Package/libfuse

-  $(call Package/fuse/Default)
+$(call Package/fuse/Default)

   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
   TITLE+= (library)
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
   TITLE+= (library)

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the FUSE shared library, needed by other programs.
+  SUBMENU:=disc
+endef
+
+define Package/libfuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE shared library, needed by other programs.

 endef
 
 endef
 

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

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


@@ -100,25 +108,19 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
-endef
-       
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/fuse{,.h} \
-               $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+       mkdir -p $(1)/usr/include
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/
+       mkdir -p $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
+       $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
+       $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc

 endef
 
 define Package/fuse-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
 endef
 
 define Package/fuse-utils/install
        $(INSTALL_DIR) $(1)/usr/bin

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/

 endef
 
 define Package/libfuse/install
 endef
 
 define Package/libfuse/install