X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4ef55873da17e9db2f0fbd7879dd38392388996e..0b7968af0202bda39b480e943d4467272596a32f:/package/fuse/Makefile?ds=sidebyside diff --git a/package/fuse/Makefile b/package/fuse/Makefile index f690f56fa..152c5402d 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,119 +1,139 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 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.5.3 -PKG_RELEASE:=1 -PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c +PKG_VERSION:=2.7.4 +PKG_RELEASE:=2 -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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_MD5SUM:=4879f06570d2225667534c37fea04213 include $(INCLUDE_DIR)/package.mk -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) +define Package/fuse/Default + TITLE:=FUSE + URL:=http://fuse.sourceforge.net/ +endef + +define Package/fuse/Default/description + FUSE (Filesystem in UserSpacE) +endef + +define Package/fuse-utils +$(call Package/fuse/Default) + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libfuse + TITLE+= (utilities) + SUBMENU:=Filesystem +endef + +define Package/fuse-utils/description +$(call Package/fuse/Default/description) + This package contains the FUSE utility 'fusermount'. +endef + +define KernelPackage/fuse +$(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) + AUTOLOAD:=$(call AutoLoad,80,fuse) + VERSION:=$(LINUX_VERSION) endef +define KernelPackage/fuse/description +$(call Package/fuse/Default/description) + This package contains the FUSE kernel module. +endef + +define Package/libfuse +$(call Package/fuse/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE+= (library) + DEPENDS:=+LINUX_2_4:kmod-fuse24 +LINUX_2_6: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. +endef + +CONFIGURE_VARS += \ + kernsrcver="$(LINUX_VERSION)" + +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --enable-lib \ + --enable-util \ + --disable-example \ + --disable-auto-modprobe \ + --with-kernel="$(LINUX_DIR)" \ + --disable-mtab + +# Since kernel 2.6.14 the fuse module is officially part of the kernel. +# Generally it is better to use the kernel's module. Because it is patched +# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx) +# and from fuse 2.8.0 on it will be removed from the fuse package anyway. +# +CONFIGURE_ARGS += --disable-kernel-module + define Build/Configure - (cd $(PKG_BUILD_DIR); \ - rm -rf config.{cache,status} ; \ + (cd $(PKG_BUILD_DIR); rm -f config.cache; \ touch configure.in ; \ touch aclocal.m4 ; \ touch Makefile.in ; \ touch include/config.h.in ; \ touch configure ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - --disable-rpath \ - --enable-kernel-module \ - --enable-lib \ - --enable-util \ - --disable-example \ - --disable-auto-modprobe \ - --with-kernel=$(LINUX_DIR) \ - --disable-mtab \ - ); + ) + $(call Build/Configure/Default) endef 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)" \ + AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \ + EXTRA_DIST="" \ all install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(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 $(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/ + 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 endef - -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 + +define Package/fuse-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ endef -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 +define Package/libfuse/install + $(INSTALL_DIR) $(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 -$(eval $(call BuildPackage,kmod-fuse)) +$(eval $(call BuildPackage,fuse-utils)) +$(eval $(call BuildPackage,libfuse)) +$(eval $(call KernelPackage,fuse))