Changeset 14164


Ignorieren:
Zeitstempel:
18.03.2017 13:21:58 (vor 10 Tagen)
Autor:
er13
Nachricht:

sundtek:

  • resolve name clash with AVM Media Server (mediasrv) reported here - from now on all sundtek binaries/libraries have sundtek somewhere in their names
  • compile-tested only
Ort:
trunk/make/sundtek
Dateien:
4 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/sundtek/Config.in

    r10231 r14164  
    88        Sundtek closed-source linux driver daemon & client. 
    99        To use this driver you have to run: 
    10         export LD_PRELOAD=/usr/lib/libmediaclient.so 
     10        export LD_PRELOAD=/usr/lib/libsundtekmediaclient.so 
    1111 
    1212comment "CAUTION: Use 'replace kernel' to avoid mem leak!" 
  • trunk/make/sundtek/files/root/etc/init.d/rc.sundtek

    r9590 r14164  
    33DAEMON=sundtek 
    44DAEMON_LONG_NAME="Sundtek DVB" 
    5 DAEMON_BIN=mediasrv 
    6 DAEMON_CHECK=mediasrv 
     5DAEMON_BIN=sundtek-mediasrv 
     6DAEMON_CHECK=sundtek-mediasrv 
    77. /etc/init.d/modlibrc 
    88 
    9 DAEMON_BIN_CONFIG=mediaclient 
     9DAEMON_BIN_CONFIG=sundtek-mediaclient 
    1010 
    1111 
  • trunk/make/sundtek/files/root/usr/lib/cgi-bin/sundtek.cgi

    r14143 r14164  
    1111echo "$(lang de:"Treiberversion" en:"Driver version"):" 
    1212echo -n '<pre><FONT SIZE=-1>' 
    13 mediasrv --build 2>&1 | html 
     13sundtek-mediasrv --build 2>&1 | html 
    1414echo '</FONT></pre>' 
    1515 
     
    1818    echo "$(lang de:"Unterst&uuml;tzte Hardware" en:"Supported hardware"):" 
    1919    echo -n '<pre><FONT SIZE=-1>' 
    20     mediaclient  --enumdevices 2>&1 | grep -C1 'SERIAL' | html 
     20    sundtek-mediaclient  --enumdevices 2>&1 | grep -C1 'SERIAL' | html 
    2121    echo '</FONT></pre>' 
    2222 
    2323    echo "$(lang de:"Verbundene Clients" en:"Connected clients"):" 
    2424    echo -n '<pre><FONT SIZE=-1>' 
    25     mediaclient  --lc 2>&1 | grep -vE '^\*|^ *$' | html 
     25    sundtek-mediaclient  --lc 2>&1 | grep -vE '^\*|^ *$' | html 
    2626    echo '</FONT></pre>' 
    2727 
     
    3131sec_begin '$(lang de:"Konfiguration" en:"Configuration")' 
    3232cat << EOF 
    33 $(lang de:"Parameter f&uuml;r 'mediaclient' (einer pro Zeile)" en:"Parameters for 'mediaclient' (one per row)") 
     33$(lang de:"Parameter f&uuml;r 'sundtek-mediaclient' (einer pro Zeile)" en:"Parameters for 'sundtek-mediaclient' (one per row)") 
    3434<p><textarea name="config" rows="9" cols="59" maxlength="255">$(html "$SUNDTEK_CONFIG")</textarea></p> 
    3535EOF 
  • trunk/make/sundtek/sundtek.mk

    r12599 r14164  
    66$(PKG)_STARTLEVEL=90 # before rrdstats 
    77 
    8 $(PKG)_BINARIES_ALL := mediasrv mediaclient libmediaclient.so 
    9 $(PKG)_BINARIES_PATH := bin/ bin/ lib/ 
    10 $(PKG)_BINARIES := $(join $($(PKG)_BINARIES_PATH),$($(PKG)_BINARIES_ALL)) 
    11 $(PKG)_BINARIES_BUILD_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DIR)/opt/%) 
    12 $(PKG)_BINARIES_TARGET_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DEST_DIR)/usr/%) 
     8$(PKG)_BINARIES            := mediasrv mediaclient 
     9$(PKG)_BINARIES_BUILD_DIR  := $($(PKG)_BINARIES:%=$($(PKG)_DIR)/opt/bin/%) 
     10$(PKG)_BINARIES_TARGET_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DEST_DIR)/usr/bin/sundtek-%) 
     11 
     12$(PKG)_LIBS                := libmediaclient.so 
     13$(PKG)_LIBS_BUILD_DIR      := $($(PKG)_LIBS:%=$($(PKG)_DIR)/opt/lib/%) 
     14$(PKG)_LIBS_TARGET_DIR     := $($(PKG)_LIBS:lib%=$($(PKG)_DEST_DIR)/usr/lib/libsundtek%) 
    1315 
    1416$(PKG)_BUILD_PREREQ += dd 
     
    2628$(PKG_CONFIGURED_NOP) 
    2729 
    28 $($(PKG)_BINARIES_BUILD_DIR): $($(PKG)_DIR)/.configured 
     30$($(PKG)_BINARIES_BUILD_DIR) $($(PKG)_LIBS_BUILD_DIR): $($(PKG)_DIR)/.configured 
    2931    @chmod 755 $@ 
    3032 
    31 $($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/%: $($(PKG)_DIR)/opt/% 
     33$($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/bin/sundtek-%: $($(PKG)_DIR)/opt/bin/% 
     34    $(INSTALL_BINARY_STRIP) 
     35 
     36$($(PKG)_LIBS_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/lib/libsundtek%: $($(PKG)_DIR)/opt/lib/lib% 
    3237    $(INSTALL_BINARY_STRIP) 
    3338 
    3439$(pkg): 
    3540 
    36 $(pkg)-precompiled: $($(PKG)_BINARIES_TARGET_DIR) 
     41$(pkg)-precompiled: $($(PKG)_BINARIES_TARGET_DIR) $($(PKG)_LIBS_TARGET_DIR) 
    3742 
    3843$(pkg)-clean: 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.