X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Ffuse%2FMakefile;h=792f5e67e0f1b8e4faa445942fc22652463b7b60;hp=8c6b2ce56470e2803fb12dc3aa5645653dbc9107;hb=8d306ccf1a24b1a84d4f11cfe2b1b72edb99c66b;hpb=39ed9eab85c390e575242b9d170f290272b6f582

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 8c6b2ce564..792f5e67e0 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,21 +10,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.5.3
+PKG_VERSION:=2.6.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94
 
 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/
@@ -34,33 +31,52 @@ define Package/fuse-utils
   $(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/kmod-fuse
+define KernelPackage/fuse
+  SUBMENU:=Filesystems
   $(call Package/fuse/Default)
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
+  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)
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef
 
 define Package/libfuse
   $(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
 
+CONFIGURE_VARS += \
+	 kernsrcver="$(LINUX_VERSION)"
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-kernel-module \
+	--enable-lib \
+	--enable-util \
+	--disable-example \
+	--disable-auto-modprobe \
+	--with-kernel="$(LINUX_DIR)" \
+	--disable-mtab
+
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
 		touch configure.in ; \
@@ -68,39 +84,8 @@ define Build/Configure
 		touch Makefile.in ; \
 		touch include/config.h.in ; \
 		touch configure ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--enable-kernel-module \
-			--enable-lib \
-			--enable-util \
-			--disable-example \
-			--disable-auto-modprobe \
-			--with-kernel="$(LINUX_DIR)" \
-			--disable-mtab \
-	);
+	)
+	$(call Build/Configure/Default)
 endef
 
 define Build/Compile
@@ -108,6 +93,8 @@ 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
 
@@ -129,25 +116,15 @@ define Build/UninstallDev
 endef
 
 define Package/fuse-utils/install
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
-endef
-
-define Package/kmod-fuse/install
-	install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-	$(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
-		$(1)/lib/modules/$(LINUX_VERSION)/
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
-	install -d -m0755 $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
 define Package/libfuse/install
-	install -d -m0755 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,fuse-utils))
-$(eval $(call BuildPackage,kmod-fuse))
 $(eval $(call BuildPackage,libfuse))
+$(eval $(call KernelPackage,fuse))