Changeset 14158


Ignorieren:
Zeitstempel:
16.03.2017 21:09:36 (vor 2 Monaten)
Autor:
er13
Nachricht:

fuse:

  • split package in fuse and fuse-kernel-module, the latter one is used only for kernel-2.13.x
Ort:
trunk/make
Dateien:
2 hinzugefügt
2 gelöscht
4 bearbeitet
5 kopiert
1 verschoben

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/fuse-kernel-module/Makefile.in

    r14157 r14158  
    11ifeq ($(and $(strip $(FREETZ_MODULE_fuse)),$(strip $(FREETZ_KERNEL_VERSION_2_6_13))),y) 
    2 TARGETS+=fuse 
     2TARGETS+=fuse-kernel-module 
    33endif 
  • trunk/make/fuse-kernel-module/fuse-kernel-module.mk

    r14157 r14158  
    1 $(call PKG_INIT_BIN, $(if $(FREETZ_PACKAGE_FUSE_VERSION_2_7),2.7.6,2.9.7)) 
    2 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
    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 
     1$(call PKG_INIT_BIN, 2.7.6) 
     2$(PKG)_SOURCE:=fuse-$($(PKG)_VERSION).tar.gz 
     3$(PKG)_SOURCE_MD5:=319f12dffd6f7073628fefc980254f4a 
     4$(PKG)_SITE:=https://github.com/libfuse/libfuse/releases/download/fuse_2_9_4 
    85 
    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)) 
    13  
    14 $(PKG)_BINARY:=$($(PKG)_DIR)/util/fusermount 
    15 $(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/fusermount 
    16  
    17 $(PKG)_LIB_BINARY:=$($(PKG)_DIR)/lib/.libs/libfuse.so.$($(PKG)_VERSION) 
    18 $(PKG)_LIB_STAGING_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libfuse.so.$($(PKG)_VERSION) 
    19 $(PKG)_LIB_TARGET_BINARY:=$($(PKG)_TARGET_LIBDIR)/libfuse.so.$($(PKG)_VERSION) 
     6$(PKG)_BINARY:=$($(PKG)_DIR)/fuse.ko 
     7$(PKG)_TARGET_DIR:=$(KERNEL_MODULES_DIR)/fs/fuse 
     8$(PKG)_TARGET_BINARY:=$($(PKG)_TARGET_DIR)/fuse.ko 
    209 
    2110$(PKG)_DEPENDS_ON += kernel 
    2211 
    2312$(PKG)_REBUILD_SUBOPTS += FREETZ_KERNEL_LAYOUT 
    24 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_FUSE_VERSION_2_7 
    25 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_FUSE_VERSION_2_9 
    2613 
    27 $(PKG)_CONFIGURE_OPTIONS += --enable-shared 
    28 $(PKG)_CONFIGURE_OPTIONS += --enable-static 
    29 $(PKG)_CONFIGURE_OPTIONS += --disable-rpath 
    30 $(PKG)_CONFIGURE_OPTIONS += --enable-lib 
    31 $(PKG)_CONFIGURE_OPTIONS += --enable-util 
    32 $(PKG)_CONFIGURE_OPTIONS += --disable-example 
    33 $(PKG)_CONFIGURE_OPTIONS += --disable-mtab 
    34 $(PKG)_CONFIGURE_OPTIONS += --with-gnu-ld 
     14$(PKG)_CONFIGURE_OPTIONS += --enable-kernel-module 
    3515$(PKG)_CONFIGURE_OPTIONS += --with-kernel="$(FREETZ_BASE_DIR)/$(KERNEL_SOURCE_DIR)" 
    3616 
    37 ifeq ($($(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 
    41 $(PKG)_CONFIGURE_OPTIONS += --enable-kernel-module 
    42 else 
    43 $(PKG)_CONFIGURE_OPTIONS += --disable-kernel-module 
    44 endif 
     17define $(PKG)_CUSTOM_UNPACK 
     18mkdir -p $($(PKG)_DIR); $(TOOLS_DIR)/gunzip -c $(1) | $(TAR) -C $($(PKG)_DIR) $(VERBOSE) -x --strip-components=2 fuse-$($(PKG)_VERSION)/kernel; 
     19endef 
    4520 
    4621$(PKG_SOURCE_DOWNLOAD) 
     
    4823$(PKG_CONFIGURED_CONFIGURE) 
    4924 
    50 $($(PKG)_BINARY) $($(PKG)_LIB_BINARY) $(if $($(PKG)_BUILD_KERNEL_MODULE),$($(PKG)_MOD_BINARY)): $($(PKG)_DIR)/.configured 
    51     $(SUBMAKE) -C $(FUSE_DIR) \ 
     25$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
     26    $(SUBMAKE) -C $(FUSE_KERNEL_MODULE_DIR) \ 
    5227        ARCH="$(KERNEL_ARCH)" \ 
    5328        CROSS_COMPILE="$(KERNEL_CROSS)" \ 
     
    5530        all 
    5631 
    57 $($(PKG)_LIB_STAGING_BINARY): $($(PKG)_LIB_BINARY) 
    58     cp $(FUSE_DIR)/fuse.pc $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/fuse.pc 
    59     $(SUBMAKE) -C $(FUSE_DIR)/lib \ 
    60         ARCH="$(KERNEL_ARCH)" \ 
    61         CROSS_COMPILE="$(KERNEL_CROSS)" \ 
    62         DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \ 
    63         install 
    64     $(PKG_FIX_LIBTOOL_LA) \ 
    65         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libfuse.la \ 
    66         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libulockmgr.la \ 
    67         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/fuse.pc 
    68     $(SUBMAKE) -C $(FUSE_DIR)/include \ 
    69         ARCH="$(KERNEL_ARCH)" \ 
    70         CROSS_COMPILE="$(KERNEL_CROSS)" \ 
    71         DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \ 
    72         install 
    73  
    7432$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY) 
    75     $(INSTALL_BINARY_STRIP) 
    76  
    77 $($(PKG)_LIB_TARGET_BINARY): $($(PKG)_LIB_STAGING_BINARY) 
    78     $(INSTALL_LIBRARY_STRIP) 
    79  
    80 ifeq ($($(PKG)_BUILD_KERNEL_MODULE),y) 
    81 $($(PKG)_MOD_TARGET_BINARY): $($(PKG)_MOD_BINARY) 
    8233    $(INSTALL_FILE) 
    83 endif 
    8434 
    8535$(pkg): 
    8636 
    87 $(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_LIB_TARGET_BINARY) \ 
    88         $(if $($(PKG)_BUILD_KERNEL_MODULE),$($(PKG)_MOD_TARGET_BINARY)) 
     37$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) 
    8938 
    9039$(pkg)-clean: 
    91     -$(SUBMAKE) -C $(FUSE_DIR) clean 
    92     $(RM) \ 
    93         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/fuse.h \ 
    94         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/ulockmgr.h \ 
    95         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/fuse* \ 
    96         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libfuse* \ 
    97         $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libulockmgr* 
     40    -$(SUBMAKE) -C $(FUSE_KERNEL_MODULE_DIR) clean 
    9841 
    9942$(pkg)-uninstall: 
    100     $(RM) \ 
    101         $(FUSE_TARGET_BINARY) \ 
    102         $(FUSE_TARGET_LIBDIR)/libfuse*.so* \ 
    103         $(if $(FUSE_BUILD_KERNEL_MODULE),$(FUSE_MOD_TARGET_BINARY)) 
     43    $(RM) $(FUSE_KERNEL_MODULE_TARGET_BINARY) 
    10444 
    105 $(call PKG_ADD_LIB,libfuse) 
    10645$(PKG_FINISH) 
  • trunk/make/fuse-kernel-module/patches/102-no_depmod.patch

    r14157 r14158  
    1 --- kernel/Makefile.in 
    2 +++ kernel/Makefile.in 
     1--- Makefile.in 
     2+++ Makefile.in 
    33@@ -25,11 +25,9 @@ 
    44 install-y: all 
  • trunk/make/fuse/Config.in

    r14156 r14158  
    11config FREETZ_PACKAGE_FUSE 
    2     bool "FUSE (binary only)" 
     2    bool "FUSE 2.9.7 (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  
    24 if FREETZ_PACKAGE_FUSE || FREETZ_LIB_libfuse 
    25  
    26 config FREETZ_PACKAGE_FUSE_VERSION_2_7 
    27     bool 
    28     depends on FREETZ_KERNEL_VERSION_2_6_13_MAX 
    29     default y 
    30  
    31 config FREETZ_PACKAGE_FUSE_VERSION_2_9 
    32     bool 
    33     depends on FREETZ_KERNEL_VERSION_2_6_19_MIN 
    34     default y 
    35  
    36 endif 
  • trunk/make/fuse/external.files

    r14156 r14158  
    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" 
     1[ "$EXTERNAL_FREETZ_LIB_libfuse" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libfuse.so.2.9.7" 
  • trunk/make/fuse/external.in.libs

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

    r14157 r14158  
    1 $(call PKG_INIT_BIN, $(if $(FREETZ_PACKAGE_FUSE_VERSION_2_7),2.7.6,2.9.7)) 
     1$(call PKG_INIT_BIN, 2.9.7) 
    22$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
    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 
     3$(PKG)_SOURCE_MD5:=9bd4ce8184745fd3d000ca2692adacdb 
     4$(PKG)_SITE:=https://github.com/libfuse/libfuse/releases/download/fuse-$($(PKG)_VERSION) 
    85 
    9 $(PKG)_CONDITIONAL_PATCHES+=$(call GET_MAJOR_VERSION,$($(PKG)_VERSION)) 
    106$(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)) 
    137 
    148$(PKG)_BINARY:=$($(PKG)_DIR)/util/fusermount 
     
    1913$(PKG)_LIB_TARGET_BINARY:=$($(PKG)_TARGET_LIBDIR)/libfuse.so.$($(PKG)_VERSION) 
    2014 
    21 $(PKG)_DEPENDS_ON += kernel 
    22  
    23 $(PKG)_REBUILD_SUBOPTS += FREETZ_KERNEL_LAYOUT 
    24 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_FUSE_VERSION_2_7 
    25 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_FUSE_VERSION_2_9 
    26  
    2715$(PKG)_CONFIGURE_OPTIONS += --enable-shared 
    2816$(PKG)_CONFIGURE_OPTIONS += --enable-static 
    29 $(PKG)_CONFIGURE_OPTIONS += --disable-rpath 
    3017$(PKG)_CONFIGURE_OPTIONS += --enable-lib 
    3118$(PKG)_CONFIGURE_OPTIONS += --enable-util 
     19$(PKG)_CONFIGURE_OPTIONS += --disable-mtab 
    3220$(PKG)_CONFIGURE_OPTIONS += --disable-example 
    33 $(PKG)_CONFIGURE_OPTIONS += --disable-mtab 
    3421$(PKG)_CONFIGURE_OPTIONS += --with-gnu-ld 
    35 $(PKG)_CONFIGURE_OPTIONS += --with-kernel="$(FREETZ_BASE_DIR)/$(KERNEL_SOURCE_DIR)" 
    36  
    37 ifeq ($($(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 
    41 $(PKG)_CONFIGURE_OPTIONS += --enable-kernel-module 
    42 else 
    43 $(PKG)_CONFIGURE_OPTIONS += --disable-kernel-module 
    44 endif 
     22$(PKG)_CONFIGURE_OPTIONS += --disable-rpath 
    4523 
    4624$(PKG_SOURCE_DOWNLOAD) 
     
    4826$(PKG_CONFIGURED_CONFIGURE) 
    4927 
    50 $($(PKG)_BINARY) $($(PKG)_LIB_BINARY) $(if $($(PKG)_BUILD_KERNEL_MODULE),$($(PKG)_MOD_BINARY)): $($(PKG)_DIR)/.configured 
     28$($(PKG)_BINARY) $($(PKG)_LIB_BINARY): $($(PKG)_DIR)/.configured 
    5129    $(SUBMAKE) -C $(FUSE_DIR) \ 
    52         ARCH="$(KERNEL_ARCH)" \ 
    53         CROSS_COMPILE="$(KERNEL_CROSS)" \ 
    5430        V=1 \ 
    5531        all 
     
    5834    cp $(FUSE_DIR)/fuse.pc $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/fuse.pc 
    5935    $(SUBMAKE) -C $(FUSE_DIR)/lib \ 
    60         ARCH="$(KERNEL_ARCH)" \ 
    61         CROSS_COMPILE="$(KERNEL_CROSS)" \ 
    6236        DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \ 
    6337        install 
     
    6741        $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/fuse.pc 
    6842    $(SUBMAKE) -C $(FUSE_DIR)/include \ 
    69         ARCH="$(KERNEL_ARCH)" \ 
    70         CROSS_COMPILE="$(KERNEL_CROSS)" \ 
    7143        DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \ 
    7244        install 
     
    7850    $(INSTALL_LIBRARY_STRIP) 
    7951 
    80 ifeq ($($(PKG)_BUILD_KERNEL_MODULE),y) 
    81 $($(PKG)_MOD_TARGET_BINARY): $($(PKG)_MOD_BINARY) 
    82     $(INSTALL_FILE) 
    83 endif 
    84  
    8552$(pkg): 
    8653 
    87 $(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_LIB_TARGET_BINARY) \ 
    88         $(if $($(PKG)_BUILD_KERNEL_MODULE),$($(PKG)_MOD_TARGET_BINARY)) 
     54$(pkg)-precompiled: $($(PKG)_TARGET_BINARY) $($(PKG)_LIB_TARGET_BINARY) 
    8955 
    9056$(pkg)-clean: 
     
    10066    $(RM) \ 
    10167        $(FUSE_TARGET_BINARY) \ 
    102         $(FUSE_TARGET_LIBDIR)/libfuse*.so* \ 
    103         $(if $(FUSE_BUILD_KERNEL_MODULE),$(FUSE_MOD_TARGET_BINARY)) 
     68        $(FUSE_TARGET_LIBDIR)/libfuse*.so* 
    10469 
    10570$(call PKG_ADD_LIB,libfuse) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.