upgrade to 2.6.15.6, fix default config for Aruba

[openwrt.git] / openwrt / package / fuse / Makefile

diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile
index 35d096a..7f3572e 100644 (file)
--- a/openwrt/package/fuse/Makefile
+++ b/openwrt/package/fuse/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=0bee98df5b2a29841f75fc188975eabc
+PKG_MD5SUM:=553bd9c5a4f3cd27f3e2b93844711e4c
 
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -58,6 +58,7 @@ $(PKG_BUILD_DIR)/.configured:
                        --disable-example \
                        --disable-auto-modprobe \
                        --with-kernel=$(LINUX_DIR) \
+                       --disable-mtab \
        );
        touch $@
 
@@ -71,25 +72,25 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBFUSE):
        mkdir -p $(IDIR_LIBFUSE)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
+       $(CP) $(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/
+       $(CP) $(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
        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
        
@@ -103,5 +104,5 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libfuse.so* \
                $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev