X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/89ca5e940c9f72c05dc4e888878b4acdacb0cb1d..184a32bc943e168571c9f0d0ff22abb94d3d532b:/package/fuse/Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 35d096a5a..f690f56fa 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,25 +1,39 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.5.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=0bee98df5b2a29841f75fc188975eabc
+PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/kmod-fuse
+SECTION:=drivers
+CATEGORY:=Drivers
+DEPENDS:=
+TITLE:=FUSE (Filesystem in UserSpacE)
+DESCRIPTION:=FUSE (Filesystem in UserSpacE)
+URL:=http://fuse.sourceforge.net/
+VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		rm -rf config.{cache,status} ; \
 		touch configure.in ; \
@@ -52,56 +66,54 @@ $(PKG_BUILD_DIR)/.configured:
 			--enable-shared \
 			--enable-static \
 			--disable-rpath \
-			--disable-kernel-module \
+			--enable-kernel-module \
 			--enable-lib \
 			--enable-util \
 			--disable-example \
 			--disable-auto-modprobe \
 			--with-kernel=$(LINUX_DIR) \
+			--disable-mtab \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		PATH="$(TARGET_PATH)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
-	touch $@
+endef
 
-$(IPKG_LIBFUSE):
-	mkdir -p $(IDIR_LIBFUSE)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
-	$(RSTRIP) $(IDIR_LIBFUSE)
-	$(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
-
-$(IPKG_FUSE_UTILS):
-	mkdir -p $(IDIR_FUSE_UTILS)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
-	$(RSTRIP) $(IDIR_FUSE_UTILS)
-	$(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/
+	$(CP)	$(PKG_INSTALL_DIR)/usr/include/fuse{,.h} \
+		$(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(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 -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(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
 	
-install-dev: $(STAGING_DIR)/usr/lib/libfuse.so
+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
+endef
 
-uninstall-dev:
-	rm -rf \
-		$(STAGING_DIR)/usr/include/fuse \
-		$(STAGING_DIR)/usr/include/fuse.h \
-		$(STAGING_DIR)/usr/lib/libfuse.a \
-		$(STAGING_DIR)/usr/lib/libfuse.so* \
-		$(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc \
+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
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
+endef
 
-compile: install-dev
-clean: uninstall-dev
+$(eval $(call BuildPackage,kmod-fuse))