Changeset 14720


Ignorieren:
Zeitstempel:
07.06.2018 18:28:42 (vor 4 Monaten)
Autor:
er13
Nachricht:

strace-4.22: make it compile against kernel-2.6.19

refs #2958

Ort:
trunk
Dateien:
3 hinzugefügt
3 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14718 r14720  
    188188    * sqlite 3.23.1 
    189189    * sslh 1.18 
    190     * strace 4.9 (kernel-2.6.13) / 4.10 (kernel-2.6.19) / 4.22 (all other kernel versions) 
     190    * strace 4.9 (kernel-2.6.13) / 4.22 (all other kernel versions) 
    191191    * stunnel 5.46 
    192192    * subversion 1.8.19/1.9.7 
  • trunk/make/strace/Config.in

    r14718 r14720  
    11config FREETZ_PACKAGE_STRACE 
    2     bool "strace (binary only)" 
     2    bool "strace 4.22/4.9 (binary only)" 
    33    default n 
    44    select FREETZ_REMOVE_STRACE if FREETZ_AVM_HAS_STRACE 
  • trunk/make/strace/strace.mk

    r14718 r14720  
    11# 
    22# recent versions of strace do not support older kernel versions anymore, 
    3 # that's the reason we have to stick to an older strace version for kernel versions 2.6.13 & 2.6.19 
     3# that's the reason we have to stick to an older strace version for kernel-2.6.13 
    44# 
    5 STRACE_VERSION__KERNEL_2.6.13:=4.9 
    6 STRACE_VERSION__KERNEL_2.6.19:=4.10 
    7  
    8 $(call PKG_INIT_BIN, $(or $(strip $(STRACE_VERSION__KERNEL_$(call qstrip,$(FREETZ_KERNEL_VERSION_MAJOR)))),4.22)) 
     5$(call PKG_INIT_BIN, $(if $(FREETZ_KERNEL_VERSION_2_6_13),4.9,4.22)) 
    96$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz 
    107$(PKG)_SOURCE_MD5_4.9 :=885eafadb10f6c60464a266d3929a2a4 
    11 $(PKG)_SOURCE_MD5_4.10:=107a5be455493861189e9b57a3a51912 
    128$(PKG)_SOURCE_MD5_4.22:=7a2a7d7715da6e6834bc65bd09bace1c 
    139$(PKG)_SOURCE_MD5:=$($(PKG)_SOURCE_MD5_$($(PKG)_VERSION)) 
     
    2723 
    2824$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
    29     $(SUBMAKE1) -C $(STRACE_DIR) 
     25    $(SUBMAKE) -C $(STRACE_DIR) 
    3026 
    3127$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.