Changeset 14520


Ignorieren:
Zeitstempel:
07.11.2017 23:19:00 (vor 2 Wochen)
Autor:
er13
Nachricht:

squashfs4 target package:

  • rename it to squashfs4-be
Ort:
trunk/make/squashfs4-be
Dateien:
1 gelöscht
3 bearbeitet
1 kopiert
1 verschoben

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/squashfs4-be/Config.in

    r13675 r14520  
    1 config FREETZ_PACKAGE_SQUASHFS4 
     1config FREETZ_PACKAGE_SQUASHFS4_BE 
    22    bool "squashfs-tools 4.3 - with AVM-BE support" 
    33    depends on FREETZ_KERNEL_VERSION_2_6_28_MIN 
    4     select FREETZ_LIB_libm        if !FREETZ_PACKAGE_SQUASHFS4_ALL_STAT 
    5     select FREETZ_LIB_libpthread  if !FREETZ_PACKAGE_SQUASHFS4_ALL_STAT 
    6     select FREETZ_LIB_libz        if  FREETZ_PACKAGE_SQUASHFS4_ALL_DYN && FREETZ_PACKAGE_SQUASHFS4_LEGACY 
    7     select FREETZ_LIB_liblzma     if  FREETZ_PACKAGE_SQUASHFS4_ALL_DYN 
     4    select FREETZ_LIB_libm        if !FREETZ_PACKAGE_SQUASHFS4_BE_ALL_STAT 
     5    select FREETZ_LIB_libpthread  if !FREETZ_PACKAGE_SQUASHFS4_BE_ALL_STAT 
     6    select FREETZ_LIB_libz        if  FREETZ_PACKAGE_SQUASHFS4_BE_ALL_DYN && FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY 
     7    select FREETZ_LIB_liblzma     if  FREETZ_PACKAGE_SQUASHFS4_BE_ALL_DYN 
    88    default n 
    99    help 
     
    1616        version. 
    1717 
    18 config FREETZ_PACKAGE_SQUASHFS4_LEGACY 
    19     depends on FREETZ_PACKAGE_SQUASHFS4 
     18config FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY 
     19    depends on FREETZ_PACKAGE_SQUASHFS4_BE 
    2020    bool "with SquashFS-1/2/3 support" 
    2121    default n 
     
    2626 
    2727choice 
    28     depends on FREETZ_PACKAGE_SQUASHFS4 
     28    depends on FREETZ_PACKAGE_SQUASHFS4_BE 
    2929    prompt "Link" 
    30     default FREETZ_PACKAGE_SQUASHFS4_ALL_DYN 
     30    default FREETZ_PACKAGE_SQUASHFS4_BE_ALL_DYN 
    3131 
    32     config FREETZ_PACKAGE_SQUASHFS4_ALL_DYN 
     32    config FREETZ_PACKAGE_SQUASHFS4_BE_ALL_DYN 
    3333        bool "all libraries dynamically" 
    3434 
    35     config FREETZ_PACKAGE_SQUASHFS4_COMP_STAT 
     35    config FREETZ_PACKAGE_SQUASHFS4_BE_COMP_STAT 
    3636        bool "compression libraries statically" 
    3737 
    38     config FREETZ_PACKAGE_SQUASHFS4_ALL_STAT 
     38    config FREETZ_PACKAGE_SQUASHFS4_BE_ALL_STAT 
    3939        bool "all libraries statically" 
    4040endchoice 
  • trunk/make/squashfs4-be/external.files

    r14036 r14520  
    1 [ "$EXTERNAL_FREETZ_PACKAGE_SQUASHFS4" == "y" ] && EXTERNAL_FILES+=" /usr/bin/mksquashfs4-avm-be /usr/bin/unsquashfs4-avm-be" 
     1[ "$EXTERNAL_FREETZ_PACKAGE_SQUASHFS4_BE" == "y" ] && EXTERNAL_FILES+=" /usr/bin/mksquashfs4-avm-be /usr/bin/unsquashfs4-avm-be" 
  • trunk/make/squashfs4-be/external.in

    r14036 r14520  
    1 config EXTERNAL_FREETZ_PACKAGE_SQUASHFS4 
    2     depends on EXTERNAL_ENABLED && FREETZ_PACKAGE_SQUASHFS4 
    3     bool "squashfs4-tools" 
     1config EXTERNAL_FREETZ_PACKAGE_SQUASHFS4_BE 
     2    depends on EXTERNAL_ENABLED && FREETZ_PACKAGE_SQUASHFS4_BE 
     3    bool "squashfs4-tools (AVM-BE)" 
    44    default n 
    55    help 
  • trunk/make/squashfs4-be/squashfs4-be.mk

    r14517 r14520  
    66$(PKG)_SITE:=@SF/$($(PKG)_PRJNAME) 
    77 
    8 $(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_SQUASHFS4_LEGACY),zlib) 
     8$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY),zlib) 
    99$(PKG)_DEPENDS_ON += xz 
    1010 
    11 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_LEGACY 
    12 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_ALL_DYN 
    13 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_COMP_STAT 
    14 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_ALL_STAT 
     11$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY 
     12$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_BE_ALL_DYN 
     13$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_BE_COMP_STAT 
     14$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SQUASHFS4_BE_ALL_STAT 
    1515 
    1616$(PKG)_BUILD_DIR := $($(PKG)_DIR)/squashfs-tools 
     
    2121 
    2222$(PKG)_LDFLAGS := -Wl,--gc-sections 
    23 $(PKG)_LDFLAGS += $(if $(FREETZ_PACKAGE_SQUASHFS4_ALL_STAT),-static) 
     23$(PKG)_LDFLAGS += $(if $(FREETZ_PACKAGE_SQUASHFS4_BE_ALL_STAT),-static) 
    2424 
    25 ifneq ($(strip $(DL_DIR)/$(SQUASHFS4_SOURCE)),$(strip $(DL_DIR)/$(SQUASHFS4_HOST_BE_SOURCE))) 
     25ifneq ($(strip $(DL_DIR)/$(SQUASHFS4_BE_SOURCE)),$(strip $(DL_DIR)/$(SQUASHFS4_HOST_BE_SOURCE))) 
    2626$(PKG_SOURCE_DOWNLOAD) 
    2727endif 
     
    3030 
    3131$($(PKG)_BINARIES_BUILD_DIR): $($(PKG)_DIR)/.configured 
    32     $(SUBMAKE) -C $(SQUASHFS4_BUILD_DIR) \ 
     32    $(SUBMAKE) -C $(SQUASHFS4_BE_BUILD_DIR) \ 
    3333        CC="$(TARGET_CC)" \ 
    3434        EXTRA_CFLAGS="$(TARGET_CFLAGS) -DTARGET_FORMAT=AVM_BE -ffunction-sections -fdata-sections" \ 
    35         LEGACY_FORMATS_SUPPORT=$(if $(FREETZ_PACKAGE_SQUASHFS4_LEGACY),1,0) \ 
    36         GZIP_SUPPORT=$(if $(FREETZ_PACKAGE_SQUASHFS4_LEGACY),1,0) \ 
    37         LZMA_XZ_SUPPORT=$(if $(FREETZ_PACKAGE_SQUASHFS4_LEGACY),1,0) \ 
     35        LEGACY_FORMATS_SUPPORT=$(if $(FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY),1,0) \ 
     36        GZIP_SUPPORT=$(if $(FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY),1,0) \ 
     37        LZMA_XZ_SUPPORT=$(if $(FREETZ_PACKAGE_SQUASHFS4_BE_LEGACY),1,0) \ 
    3838        XZ_SUPPORT=1 \ 
    3939        COMP_DEFAULT=xz \ 
    4040        XATTR_SUPPORT=0 \ 
    4141        XATTR_DEFAULT=0 \ 
    42         $(if $(FREETZ_PACKAGE_SQUASHFS4_COMP_STAT),LINK_COMPRESSION_LIBS_STATICALLY=1) \ 
    43         EXTRA_LDFLAGS="$(SQUASHFS4_LDFLAGS)" \ 
    44         $(SQUASHFS4_BINARIES) 
     42        $(if $(FREETZ_PACKAGE_SQUASHFS4_BE_COMP_STAT),LINK_COMPRESSION_LIBS_STATICALLY=1) \ 
     43        EXTRA_LDFLAGS="$(SQUASHFS4_BE_LDFLAGS)" \ 
     44        $(SQUASHFS4_BE_BINARIES) 
    4545 
    4646$($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/bin/%4-avm-be: $($(PKG)_BUILD_DIR)/% 
     
    5252 
    5353$(pkg)-clean: 
    54     -$(SUBMAKE) -C $(SQUASHFS4_BUILD_DIR) clean 
     54    -$(SUBMAKE) -C $(SQUASHFS4_BE_BUILD_DIR) clean 
    5555 
    5656$(pkg)-uninstall: 
    57     $(RM) $(SQUASHFS4_BINARIES_TARGET_DIR) 
     57    $(RM) $(SQUASHFS4_BE_BINARIES_TARGET_DIR) 
    5858 
    5959$(PKG_FINISH) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.