X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Ffuse%2FMakefile;h=927c35016ebbff6b3f58e70266bc6d45e5d47dc6;hb=640652a244c6916ea5c2a886c52d477d5742e0d8;hp=d4641c115d1fe2cb905e05caf5c9d402f01c5fb9;hpb=0e6aa87e6d6d7e81b1cf36c7422be0e93b165419;p=openwrt-10.03%2F.git

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index d4641c115..927c35016 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,61 +10,68 @@ include $(TOPDIR)/rules.mk
 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_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
 
 define Package/fuse/Default
   TITLE:=FUSE
   DEPENDS:=@LINUX_2_6
-  DESCRIPTION:=\
-	FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/
 endef
 
+define Package/fuse/Default/description
+ FUSE (Filesystem in UserSpacE)
+endef
+
 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)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the FUSE utilities.
+endef
+
+define Package/fuse-utils/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE utilities.
 endef
 
 define KernelPackage/fuse
+$(call Package/fuse/Default)
   SUBMENU:=Filesystems
-  $(call Package/fuse/Default)
-  TITLE+= (kernel module)
   DEPENDS:=@LINUX_2_6
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the FUSE kernel module.
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  TITLE+= (kernel module)
   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
+  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
-  $(call Package/fuse/Default)
+$(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
   TITLE+= (library)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the FUSE shared library, needed by other programs.
 endef
 
+define Package/libfuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE shared library, needed by other programs.
+endef
+
+CONFIGURE_VARS += \
+	 kernsrcver="$(LINUX_VERSION)"
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
@@ -93,24 +100,26 @@ define Build/Compile
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
+		AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
+		EXTRA_DIST="" \
 		all install
 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
+	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 Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/fuse{,.h} \
-		$(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+	rm -rf	$(1)/usr/include/fuse{,.h} \
+		$(1)/usr/lib/libfuse.{a,so*} \
+		$(1)/usr/lib/pkgconfig/fuse.pc
 endef
 
 define Package/fuse-utils/install