Changeset 14156


Ignorieren:
Zeitstempel:
15.03.2017 23:47:02 (vor 12 Tagen)
Autor:
er13
Nachricht:

fuse:

  • add support for fuse-2.9.x, use it for kernel-versions ≥ 2.6.19
  • keep fuse-2.7.x for kernel-version 2.6.13, it's the latest fuse-version containing the source code of the fuse kernel module (required for 2.6.13)
  • closes #2791
Ort:
trunk
Dateien:
3 hinzugefügt
5 bearbeitet
2 kopiert
3 verschoben

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14152 r14156  
    9999    * ffmpeg 1.2.12 
    100100    * freetype 2.5.5 
     101    * fuse 2.9.7 
    101102    * gdb 7.9.1 
    102103    * git 2.12.0 
  • trunk/make/fuse/Config.in

    r11997 r14156  
    11config FREETZ_PACKAGE_FUSE 
    2     bool "FUSE 2.7.6 (binary only)" 
     2    bool "FUSE (binary only)" 
    33    depends on FREETZ_REPLACE_MODULE_AVAILABLE 
    44    select FREETZ_MODULE_fuse 
     
    2121 
    2222        In Freetz, the NTFS package depends on fuse, for example. 
     23 
     24if FREETZ_PACKAGE_FUSE || FREETZ_LIB_libfuse 
     25 
     26config FREETZ_PACKAGE_FUSE_VERSION_2_7 
     27    bool 
     28    depends on FREETZ_KERNEL_VERSION_2_6_13_MAX 
     29    default y 
     30 
     31config FREETZ_PACKAGE_FUSE_VERSION_2_9 
     32    bool 
     33    depends on FREETZ_KERNEL_VERSION_2_6_19_MIN 
     34    default y 
     35 
     36endif 
  • trunk/make/fuse/external.files

    r13615 r14156  
    1 [ "$EXTERNAL_FREETZ_LIB_libfuse" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libfuse.so.2.7.6" 
     1[ "$EXTERNAL_FREETZ_LIB_libfuse" == "y" -a "$FREETZ_PACKAGE_FUSE_VERSION_2_7" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libfuse.so.2.7.6" 
     2[ "$EXTERNAL_FREETZ_LIB_libfuse" == "y" -a "$FREETZ_PACKAGE_FUSE_VERSION_2_9" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libfuse.so.2.9.7" 
  • trunk/make/fuse/external.in.libs

    r13615 r14156  
    55    help 
    66        externals the following file(s): 
    7          ${FREETZ_LIBRARY_DIR}/libfuse.so.2.7.6 
     7         ${FREETZ_LIBRARY_DIR}/libfuse.so.2.X.Y 
  • trunk/make/fuse/fuse.mk

    r12669 r14156  
    1 $(call PKG_INIT_BIN, 2.7.6) 
     1$(call PKG_INIT_BIN, $(if $(FREETZ_PACKAGE_FUSE_VERSION_2_7),2.7.6,2.9.7)) 
    22$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
    3 $(PKG)_SOURCE_MD5:=319f12dffd6f7073628fefc980254f4a 
    4 $(PKG)_SITE:=@SF/fuse 
     3$(PKG)_SOURCE_MD5_2.7.6:=319f12dffd6f7073628fefc980254f4a 
     4$(PKG)_SOURCE_MD5_2.9.7:=9bd4ce8184745fd3d000ca2692adacdb 
     5$(PKG)_SOURCE_MD5:=$($(PKG)_SOURCE_MD5_$($(PKG)_VERSION)) 
     6# don't get confused by 2_9_4 - it's a subdir containing 2.9.4 and all older fuse versions (s. https://github.com/libfuse/libfuse/releases) 
     7$(PKG)_SITE:=https://github.com/libfuse/libfuse/releases/download/fuse-$($(PKG)_VERSION),https://github.com/libfuse/libfuse/releases/download/fuse_2_9_4 
     8 
     9$(PKG)_CONDITIONAL_PATCHES+=$(call GET_MAJOR_VERSION,$($(PKG)_VERSION)) 
     10$(PKG)_PATCH_POST_CMDS += $(SED) -i -r -e 's| -D_FILE_OFFSET_BITS=64||g;' fuse.pc.in {example,lib,util}/Makefile.{am,in}; 
     11 
     12$(PKG)_BUILD_KERNEL_MODULE:=$(strip $(FREETZ_KERNEL_VERSION_2_6_13)) 
    513 
    614$(PKG)_BINARY:=$($(PKG)_DIR)/util/fusermount 
    715$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/fusermount 
    8 $(PKG)_MOD_BINARY:=$($(PKG)_DIR)/kernel/fuse.ko 
    9 $(PKG)_MOD_TARGET_DIR:=$(KERNEL_MODULES_DIR)/fs/fuse 
    10 $(PKG)_MOD_TARGET_BINARY:=$($(PKG)_MOD_TARGET_DIR)/fuse.ko 
     16 
    1117$(PKG)_LIB_BINARY:=$($(PKG)_DIR)/lib/.libs/libfuse.so.$($(PKG)_VERSION) 
    1218$(PKG)_LIB_STAGING_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libfuse.so.$($(PKG)_VERSION) 
     
    1622 
    1723$(PKG)_REBUILD_SUBOPTS += FREETZ_KERNEL_LAYOUT 
    18  
    19 $(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -r -e 's|-D_FILE_OFFSET_BITS=64||g;' fuse.pc.in {example,lib,util}/Makefile.{am,in}; 
    20 $(PKG)_CONFIGURE_PRE_CMDS += $(SED) -i -r -e 's|^([ \t]*\#error .*-D_FILE_OFFSET_BITS=64.*)$$$$|/*\1*/|g;' include/fuse_common.h; 
     24$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_FUSE_VERSION_2_7 
     25$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_FUSE_VERSION_2_9 
    2126 
    2227$(PKG)_CONFIGURE_OPTIONS += --enable-shared 
     
    3035$(PKG)_CONFIGURE_OPTIONS += --with-kernel="$(FREETZ_BASE_DIR)/$(KERNEL_SOURCE_DIR)" 
    3136 
    32 ifeq ($(strip $(FREETZ_KERNEL_VERSION_2_6_13)),y) 
     37ifeq ($($(PKG)_BUILD_KERNEL_MODULE),y) 
     38$(PKG)_MOD_BINARY:=$($(PKG)_DIR)/kernel/fuse.ko 
     39$(PKG)_MOD_TARGET_DIR:=$(KERNEL_MODULES_DIR)/fs/fuse 
     40$(PKG)_MOD_TARGET_BINARY:=$($(PKG)_MOD_TARGET_DIR)/fuse.ko 
    3341$(PKG)_CONFIGURE_OPTIONS += --enable-kernel-module 
    3442$(PKG)_CONFIGURE_OPTIONS += --disable-auto-modprobe 
     
    4149$(PKG_CONFIGURED_CONFIGURE) 
    4250 
    43 $($(PKG)_BINARY) $($(PKG)_MOD_BINARY) $($(PKG)_LIB_BINARY): $($(PKG)_DIR)/.configured 
     51$($(PKG)_BINARY) $($(PKG)_LIB_BINARY) $(if $($(PKG)_BUILD_KERNEL_MODULE),$($(PKG)_MOD_BINARY)): $($(PKG)_DIR)/.configured 
    4452    $(SUBMAKE) -C $(FUSE_DIR) \ 
    4553        ARCH="$(KERNEL_ARCH)" \ 
    4654        CROSS_COMPILE="$(KERNEL_CROSS)" \ 
     55        V=1 \ 
    4756        all 
    4857 
     
    6776    $(INSTALL_BINARY_STRIP) 
    6877 
     78$($(PKG)_LIB_TARGET_BINARY): $($(PKG)_LIB_STAGING_BINARY) 
     79    $(INSTALL_LIBRARY_STRIP) 
     80 
     81ifeq ($($(PKG)_BUILD_KERNEL_MODULE),y) 
    6982$($(PKG)_MOD_TARGET_BINARY): $($(PKG)_MOD_BINARY) 
    7083    $(INSTALL_FILE) 
    71  
    72 $($(PKG)_LIB_TARGET_BINARY): $($(PKG)_LIB_STAGING_BINARY) 
    73     $(INSTALL_LIBRARY_STRIP) 
     84endif 
    7485 
    7586$(pkg): 
    7687 
    7788$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_LIB_TARGET_BINARY) \ 
    78         $(if $(FREETZ_KERNEL_VERSION_2_6_13),$($(PKG)_MOD_TARGET_BINARY)) 
     89        $(if $($(PKG)_BUILD_KERNEL_MODULE),$($(PKG)_MOD_TARGET_BINARY)) 
    7990 
    8091$(pkg)-clean: 
     
    90101    $(RM) \ 
    91102        $(FUSE_TARGET_BINARY) \ 
    92         $(FUSE_MOD_TARGET_BINARY) \ 
    93         $(FUSE_TARGET_LIBDIR)/libfuse*.so* 
     103        $(FUSE_TARGET_LIBDIR)/libfuse*.so* \ 
     104        $(if $(FUSE_BUILD_KERNEL_MODULE),$(FUSE_MOD_TARGET_BINARY)) 
    94105 
    95106$(call PKG_ADD_LIB,libfuse) 
  • trunk/make/fuse/patches/2.7/102-no_depmod.patch

    r14155 r14156  
    1 --- kernel/Makefile.in.orig 2007-02-23 12:17:45.000000000 +0100 
    2 +++ kernel/Makefile.in  2007-07-29 03:49:34.000000000 +0200 
     1--- kernel/Makefile.in 
     2+++ kernel/Makefile.in 
    33@@ -25,11 +25,9 @@ 
    44 install-y: all 
  • trunk/make/fuse/patches/2.7/112-no_break_on_mknod.patch

    r14155 r14156  
    1 --- util/Makefile.in.orig   2007-07-29 03:49:34.000000000 +0200 
    2 +++ util/Makefile.in    2007-07-29 03:49:35.000000000 +0200 
     1--- util/Makefile.in 
     2+++ util/Makefile.in 
    33@@ -583,7 +583,7 @@ 
    44 install-exec-hook: 
  • trunk/make/fuse/patches/2.7/140-no_bb_mount.patch

    r14155 r14156  
    1 --- lib/mount.c 2007-07-02 13:32:17.000000000 +0200 
    2 +++ lib/mount.c 2007-07-25 19:12:19.000000000 +0200 
     1--- lib/mount.c 
     2+++ lib/mount.c 
    33@@ -552,7 +552,8 @@ 
    44    if (mo.mtab_opts &&  fuse_opt_add_opt(&mnt_opts, mo.mtab_opts) == -1) 
  • trunk/make/fuse/patches/2.9/112-no_break_on_mknod.patch

    r14155 r14156  
    1 --- util/Makefile.in.orig   2007-07-29 03:49:34.000000000 +0200 
    2 +++ util/Makefile.in    2007-07-29 03:49:35.000000000 +0200 
    3 @@ -583,7 +583,7 @@ 
     1--- util/Makefile.in 
     2+++ util/Makefile.in 
     3@@ -723,7 +723,7 @@ 
     4  
    45 install-exec-hook: 
    5     -chown root $(DESTDIR)$(bindir)/fusermount 
    66    -chmod u+s $(DESTDIR)$(bindir)/fusermount 
    77-   @if test ! -e $(DESTDIR)/dev/fuse; then \ 
    88+   -@if test ! -e $(DESTDIR)/dev/fuse; then \ 
    9         $(mkdir_p) $(DESTDIR)/dev; \ 
     9        $(MKDIR_P) $(DESTDIR)/dev; \ 
    1010        echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \ 
    1111        mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \ 
  • trunk/make/fuse/patches/2.9/140-no_bb_mount.patch

    r14155 r14156  
    1 --- lib/mount.c 2007-07-02 13:32:17.000000000 +0200 
    2 +++ lib/mount.c 2007-07-25 19:12:19.000000000 +0200 
    3 @@ -552,7 +552,8 @@ 
     1--- lib/mount.c 
     2+++ lib/mount.c 
     3@@ -604,7 +604,8 @@ 
    44    if (mo.mtab_opts &&  fuse_opt_add_opt(&mnt_opts, mo.mtab_opts) == -1) 
    55        goto out; 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.