fixes for common config functions

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 646b9d2..06777c8 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,25 +1,33 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=fuse
 
 PKG_NAME:=fuse

-PKG_VERSION:=2.5.2
+PKG_VERSION:=2.5.3

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=ea565debe6c7486963bef05c45c50361
+PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c

 
 

+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 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
 
 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 ; \
        (cd $(PKG_BUILD_DIR); \
                rm -rf config.{cache,status} ; \
                touch configure.in ; \


@@ -52,7 +60,7 @@ $(PKG_BUILD_DIR)/.configured:
                        --enable-shared \
                        --enable-static \
                        --disable-rpath \
                        --enable-shared \
                        --enable-static \
                        --disable-rpath \

-                       --disable-kernel-module \
+                       --enable-kernel-module \

                        --enable-lib \
                        --enable-util \
                        --disable-example \
                        --enable-lib \
                        --enable-util \
                        --disable-example \


@@ -60,49 +68,46 @@ $(PKG_BUILD_DIR)/.configured:
                        --with-kernel=$(LINUX_DIR) \
                        --disable-mtab \
        );
                        --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) \
        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
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install

-       touch $@
-
-$(IPKG_LIBFUSE):
-       mkdir -p $(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) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
-       $(RSTRIP) $(IDIR_FUSE_UTILS)
-       $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
+endef

 
 

-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev

        mkdir -p $(STAGING_DIR)/usr/include
        mkdir -p $(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/
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} \
+               $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(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/
+       $(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 $(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-targets: install-dev
-clean-targets: uninstall-dev
+$(eval $(call BuildPackage,kmod-fuse))