move fuse from target/linux/package/ to package/, update to v2.5.3,

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index d5e3222..3b94187 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,11 +1,12 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.4.1
+PKG_VERSION:=2.5.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c
+PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
 
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -16,10 +17,17 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.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 ; \
@@ -28,7 +36,6 @@ $(PKG_BUILD_DIR)/.configured:
                touch include/config.h.in ; \
                touch configure ; \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
@@ -52,7 +59,7 @@ $(PKG_BUILD_DIR)/.configured:
                        --enable-shared \
                        --enable-static \
                        --disable-rpath \
-                       --disable-kernel-module \
+                       --enable-kernel-module \
                        --enable-lib \
                        --enable-util \
                        --disable-example \
@@ -60,49 +67,51 @@ $(PKG_BUILD_DIR)/.configured:
                        --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)
+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
 
-$(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 $(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 $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.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
-
-uninstall-dev:
+define Build/UninstallDev
        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 \
+               $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+endef
+
 
-compile: install-dev
-clean: uninstall-dev
+$(eval $(call BuildPackage,kmod-fuse))