X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9b1dd0934cf12875b585035ccd9c51a23bb7587b..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/fuse/Makefile?ds=inline diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 2e7f031f5..5c013a7bc 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fuse -PKG_VERSION:=2.7.1 +PKG_VERSION:=2.7.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=f95b4a238a3df5a92e9013ecb55c2c17 +PKG_MD5SUM:=98563fc7b265b7479a3178181cbcf59a include $(INCLUDE_DIR)/package.mk @@ -48,11 +48,12 @@ $(call Package/fuse/Default) SUBMENU:=Filesystems DEPENDS:=@LINUX_2_6 TITLE+= (kernel module) - FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) + KCONFIG:= CONFIG_FUSE_FS + FILES:=$(LINUX_DIR)/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,80,fuse) endef -define Kernel/Package/fuse/description +define KernelPackage/fuse/description $(call Package/fuse/Default/description) This package contains the FUSE kernel module. endef @@ -78,7 +79,6 @@ CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --disable-rpath \ - --enable-kernel-module \ --enable-lib \ --enable-util \ --disable-example \ @@ -86,6 +86,17 @@ CONFIGURE_ARGS += \ --with-kernel="$(LINUX_DIR)" \ --disable-mtab +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 ; \ @@ -117,16 +128,10 @@ define Build/InstallDev $(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 $(1)/usr/include/fuse{,.h} \ - $(1)/usr/lib/libfuse.{a,so*} \ - $(1)/usr/lib/pkgconfig/fuse.pc -endef define Package/fuse-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ endef define Package/libfuse/install