X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/74cd05d02c09a9523c5f04979fcf6d8241174b18..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/fuse/Makefile diff --git a/package/fuse/Makefile b/package/fuse/Makefile index d5e108685..cbd15e83b 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fuse -PKG_VERSION:=2.7.4 +PKG_VERSION:=2.8.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=4879f06570d2225667534c37fea04213 +PKG_MD5SUM:=a26ec54e410bb826a387947b10c0fd2c + +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -38,18 +40,19 @@ endef define Package/fuse-utils/description $(call Package/fuse/Default/description) - This package contains the FUSE utility 'fusermount'. + This package contains the FUSE utilities. + - fusermount + - ulockmgr_server endef define KernelPackage/fuse -$(call Package/fuse/Default) + $(call Package/fuse/Default) SUBMENU:=Filesystems - DEPENDS:=@LINUX_2_6 TITLE+= (kernel module) KCONFIG:= CONFIG_FUSE_FS FILES:=$(LINUX_DIR)/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) + VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE) AUTOLOAD:=$(call AutoLoad,80,fuse) - VERSION:=$(LINUX_VERSION) endef define KernelPackage/fuse/description @@ -62,87 +65,58 @@ $(call Package/fuse/Default) SECTION:=libs CATEGORY:=Libraries TITLE+= (library) - DEPENDS:=+LINUX_2_4:kmod-fuse24 +LINUX_2_6:kmod-fuse + DEPENDS:=kmod-fuse SUBMENU:=Filesystem endef define Package/libfuse/description $(call Package/fuse/Default/description) - This package contains the FUSE shared library, needed by other programs. + This package contains the FUSE shared libraries, needed by other programs. + - libfuse + - libulockmgr endef -CONFIGURE_VARS += \ - kernsrcver="$(LINUX_VERSION)" - +# generic args CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --disable-rpath \ - --enable-lib \ - --enable-util \ --disable-example \ - --disable-auto-modprobe \ - --with-kernel="$(LINUX_DIR)" \ - --disable-mtab - -# This section is disabled; since kernel 2.6.14 the fuse module is officially -# part of the kernel. The following enables this fuse packages kernel module -# instead of the kernel's, if the kernel is younger than 2.6.25. -# Generally it is better to use the kernel's module. Because it is DCACHE BUG -# patched and from fuse 2.8.0 on it will be removed from the fuse package -# anyway. -# -#ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.25)),1) -# define KernelPackage/fuse/2.6 -# KCONFIG:= -# FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) -# endef -# -# CONFIGURE_ARGS += --enable-kernel-module -#else -# CONFIGURE_ARGS += --disable-kernel-module -#endif - -define Build/Configure - (cd $(PKG_BUILD_DIR); rm -f config.cache; \ - touch configure.in ; \ - touch aclocal.m4 ; \ - touch Makefile.in ; \ - touch include/config.h.in ; \ - touch configure ; \ - ) - $(call Build/Configure/Default) -endef + --disable-mtab -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \ - EXTRA_DIST="" \ - all install -endef +# generic package uses lib & utils +CONFIGURE_ARGS += --enable-lib --enable-util define Build/InstallDev + @echo "--> Build/InstallDev enter" mkdir -p $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/{fuse,*.h} $(1)/usr/include/ mkdir -p $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib/ mkdir -p $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/ $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc + @echo "--> Build/InstallDev leave" endef define Package/fuse-utils/install + @echo "--> Package/fuse-utils/install enter" $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ + # use cp and keep fusermount sticky bit + $(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f -exec $(CP) -a {} $(1)/usr/bin/ \; + @echo "--> Package/fuse-utils/install leave" endef define Package/libfuse/install + @echo "--> Package/libfuse/install enter" $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ + @echo "--> Package/libfuse/install leave" +endef + +define Package/kmod-fuse/install + @echo "--> Package/kmod-fuse/install enter/leave" endef $(eval $(call BuildPackage,fuse-utils))