Changeset 1766


Ignore:
Timestamp:
Sep 14, 2010, 5:45:33 PM (9 years ago)
Author:
matthijs
Message:

fuse: Update to 2.8.4.

This imports the fuse package from OpenWRT trunk (r22919) unmodified.

Note that this also switches to the in-kernel fuse module, since fuse
2.8.x no longer includes a kernel module. Before, the in-kernel module
was only used for kernels >= 2.6.25, though it is included for kernels

2.6.14). This might cause an older version of the kernel module to be

used by this upgrade.

References: #490

Location:
trunk/openwrt/package/fuse
Files:
1 added
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/fuse/Makefile

    r1 r1766  
    11#
    2 # Copyright (C) 2006-2008 OpenWrt.org
     2# Copyright (C) 2006-2010 OpenWrt.org
    33#
    44# This is free software, licensed under the GNU General Public License v2.
    55# See /LICENSE for more information.
    66#
    7 # $Id: Makefile 11116 2008-05-11 22:27:32Z nico $
    87
    98include $(TOPDIR)/rules.mk
     
    1110
    1211PKG_NAME:=fuse
    13 PKG_VERSION:=2.7.3
     12PKG_VERSION:=2.8.4
    1413PKG_RELEASE:=1
    1514
    1615PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
    1716PKG_SOURCE_URL:=@SF/$(PKG_NAME)
    18 PKG_MD5SUM:=98563fc7b265b7479a3178181cbcf59a
     17PKG_MD5SUM:=a26ec54e410bb826a387947b10c0fd2c
     18
     19PKG_INSTALL:=1
    1920
    2021include $(INCLUDE_DIR)/package.mk
     
    2223define Package/fuse/Default
    2324  TITLE:=FUSE
    24   DEPENDS:=@LINUX_2_6
    2525  URL:=http://fuse.sourceforge.net/
    2626endef
     
    3434  SECTION:=utils
    3535  CATEGORY:=Utilities
    36   DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
     36  DEPENDS:=+libfuse
    3737  TITLE+= (utilities)
    38   SUBMENU:=disc
     38  SUBMENU:=Filesystem
    3939endef
    4040
     
    4242$(call Package/fuse/Default/description)
    4343 This package contains the FUSE utilities.
     44 - fusermount
     45 - ulockmgr_server
    4446endef
    4547
    4648define KernelPackage/fuse
    47 $(call Package/fuse/Default)
     49  $(call Package/fuse/Default)
    4850  SUBMENU:=Filesystems
    49   DEPENDS:=@LINUX_2_6
    5051  TITLE+= (kernel module)
    5152  KCONFIG:= CONFIG_FUSE_FS
    52   FILES:=$(LINUX_DIR)/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
     53  FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
     54  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)
    5355  AUTOLOAD:=$(call AutoLoad,80,fuse)
    5456endef
     
    6365  SECTION:=libs
    6466  CATEGORY:=Libraries
    65   DEPENDS:=@LINUX_2_6
    6667  TITLE+= (library)
    67   SUBMENU:=disc
     68  DEPENDS:=+kmod-fuse
     69  SUBMENU:=Filesystem
    6870endef
    6971
    7072define Package/libfuse/description
    7173$(call Package/fuse/Default/description)
    72  This package contains the FUSE shared library, needed by other programs.
     74 This package contains the FUSE shared libraries, needed by other programs.
     75 - libfuse
     76 - libulockmgr
    7377endef
    7478
    75 CONFIGURE_VARS += \
    76          kernsrcver="$(LINUX_VERSION)"
    77 
     79# generic args
    7880CONFIGURE_ARGS += \
    7981        --enable-shared \
    8082        --enable-static \
    8183        --disable-rpath \
    82         --enable-lib \
    83         --enable-util \
    8484        --disable-example \
    85         --disable-auto-modprobe \
    86         --with-kernel="$(LINUX_DIR)" \
    8785        --disable-mtab
    8886
    89 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.25)),1)
    90   define KernelPackage/fuse/2.6
    91     KCONFIG:=
    92     FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
    93   endef
    94 
    95  CONFIGURE_ARGS += --enable-kernel-module
    96 else
    97  CONFIGURE_ARGS += --disable-kernel-module
    98 endif
    99 
    100 define Build/Configure
    101         (cd $(PKG_BUILD_DIR); rm -f config.cache; \
    102                 touch configure.in ; \
    103                 touch aclocal.m4 ; \
    104                 touch Makefile.in ; \
    105                 touch include/config.h.in ; \
    106                 touch configure ; \
    107         )
    108         $(call Build/Configure/Default)
    109 endef
    110 
    111 define Build/Compile
    112         $(MAKE) -C $(PKG_BUILD_DIR) \
    113                 ARCH="$(LINUX_KARCH)" \
    114                 CROSS_COMPILE="$(TARGET_CROSS)" \
    115                 DESTDIR="$(PKG_INSTALL_DIR)" \
    116                 AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
    117                 EXTRA_DIST="" \
    118                 all install
    119 endef
     87# generic package uses lib & utils
     88CONFIGURE_ARGS += --enable-lib --enable-util
    12089
    12190define Build/InstallDev
     91        @echo "--> Build/InstallDev enter"
    12292        mkdir -p $(1)/usr/include
    123         $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
     93        $(CP)   $(PKG_INSTALL_DIR)/usr/include/{fuse,*.h} $(1)/usr/include/
    12494        mkdir -p $(1)/usr/lib
    125         $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/
     95        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib/
    12696        mkdir -p $(1)/usr/lib/pkgconfig
    12797        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
    12898        $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
    12999        $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
     100        @echo "--> Build/InstallDev leave"
    130101endef
    131102
    132103define Package/fuse-utils/install
     104        @echo "--> Package/fuse-utils/install enter"
    133105        $(INSTALL_DIR) $(1)/usr/bin
    134         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
     106        # use cp and keep fusermount sticky bit
     107        $(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f -exec $(CP) -a {} $(1)/usr/bin/ \;
     108        @echo "--> Package/fuse-utils/install leave"
    135109endef
    136110
    137111define Package/libfuse/install
     112        @echo "--> Package/libfuse/install enter"
    138113        $(INSTALL_DIR) $(1)/usr/lib
    139         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
     114        $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
     115        @echo "--> Package/libfuse/install leave"
     116endef
     117
     118define Package/kmod-fuse/install
     119        @echo "--> Package/kmod-fuse/install enter/leave"
    140120endef
    141121
  • trunk/openwrt/package/fuse/patches/112-no_break_on_mknod.patch

    r1 r1766  
    1 --- fuse-2.7.3.orig/util/Makefile.in    2008-02-19 15:00:55.000000000 -0500
    2 +++ fuse-2.7.3/util/Makefile.in 2008-03-17 14:14:10.000000000 -0400
    3 @@ -528,7 +528,7 @@
     1--- a/util/Makefile.in
     2+++ b/util/Makefile.in
     3@@ -585,7 +585,7 @@ uninstall-am: uninstall-binPROGRAMS unin
    44 install-exec-hook:
    55        -chown root $(DESTDIR)$(bindir)/fusermount
Note: See TracChangeset for help on using the changeset viewer.