From a5621b8bbf4962cd689175d102450f4a1f6e5add Mon Sep 17 00:00:00 2001
From: peter <peter@gmail.com>
Date: Thu, 8 Dec 2011 08:48:11 +0100
Subject: [PATCH] fix for unpacking the installer

---
 packages/3rdparty/driver/sundtek/meta         |  6 +++---
 packages/3rdparty/driver/sundtek/unpack       | 14 ++++++++++---
 packages/addons/driver/sundtek-mediatv/addon  |  2 +-
 .../config/device_attach_detach.sh            | 20 +++----------------
 packages/addons/driver/sundtek-mediatv/meta   |  4 ++--
 .../source/bin/sundtek-mediatv.service        |  5 +----
 .../driver/sundtek-mediatv/source/default.py  |  0
 .../source/sleep.d/sundtek-mediatv.power      |  6 +++---
 8 files changed, 24 insertions(+), 33 deletions(-)
 mode change 100755 => 100644 packages/3rdparty/driver/sundtek/meta
 mode change 100644 => 100755 packages/addons/driver/sundtek-mediatv/config/device_attach_detach.sh
 mode change 100644 => 100755 packages/addons/driver/sundtek-mediatv/meta
 mode change 100644 => 100755 packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.service
 mode change 100644 => 100755 packages/addons/driver/sundtek-mediatv/source/default.py

diff --git a/packages/3rdparty/driver/sundtek/meta b/packages/3rdparty/driver/sundtek/meta
old mode 100755
new mode 100644
index a3927ac6d7..065dcc2e76
--- a/packages/3rdparty/driver/sundtek/meta
+++ b/packages/3rdparty/driver/sundtek/meta
@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="sundtek"
-PKG_VERSION="installer_111001.1658"
-#PKG_VERSION="installer_development"
+#PKG_VERSION="installer_111001.1658"
+PKG_VERSION="installer_development"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL="http://www.sundtek.de/media/${PKG_NAME}_${PKG_VERSION}.sh"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
diff --git a/packages/3rdparty/driver/sundtek/unpack b/packages/3rdparty/driver/sundtek/unpack
index 2691f8a79a..8c60bfa070 100755
--- a/packages/3rdparty/driver/sundtek/unpack
+++ b/packages/3rdparty/driver/sundtek/unpack
@@ -22,10 +22,18 @@
 
 . config/options $1
 
+mkdir -p $BUILD/${PKG_NAME}_${PKG_VERSION}
+  
 (
-  mkdir -p $BUILD/${PKG_NAME}_${PKG_VERSION}
   cd $BUILD/${PKG_NAME}_${PKG_VERSION}
-  sh $SOURCES/$1/${PKG_NAME}_${PKG_VERSION}.sh -e >/dev/null 2>&1
+
+	if [ ${SOURCES:0:1} = "/" ]; then
+		SRC_INSTALLER_ROOT=""
+	else
+		SRC_INSTALLER_ROOT="$ROOT/"
+	fi
+
+  sh ${SRC_INSTALLER_ROOT}$SOURCES/$1/${PKG_NAME}_${PKG_VERSION}.sh -e >/dev/null 2>&1
 
   rm chk* installer.tar.gz
   rm -r 32bit23 arm* dreambox mips* openwrtmipsr2 ppc*
@@ -33,6 +41,7 @@
 
 [ "$TARGET_ARCH" = "i386" ] && ARCH_DIR=32bit
 [ "$TARGET_ARCH" = "x86_64" ] && ARCH_DIR=64bit
+
 SUNDTEK_ROOT=$BUILD/${PKG_NAME}_${PKG_VERSION}/rootsys
 
 mkdir -p $SUNDTEK_ROOT
@@ -49,7 +58,6 @@ chmod 755 $SUNDTEK_ROOT/opt/bin/*
 # /etc/sundtek.conf
 # mediaclient
 # /etc/sundtek_diseqc.conf
-
 #perl -pi -e 's|\x2F\x65\x74\x63\x2F\x73\x75\x6E\x49\xBB\x64\x74\x65\x6B\x2E\x63\x6F\x6E\x66|\x2F\x74\x6D\x70\x2F\x73\x75\x6E\x49\xBB\x64\x74\x65\x6B\x2E\x63\x6F\x6E\x66|g' $SUNDTEK_ROOT/opt/bin/mediasrv
 #perl -pi -e 's|/etc/sundtek.conf|/tmp/sundtek.conf|g' $SUNDTEK_ROOT/opt/bin/mediasrv
 #perl -pi -e 's|/etc/sundtek.conf|/tmp/sundtek.conf|g' $SUNDTEK_ROOT/opt/bin/dvb/libdrv_em28xx.so
diff --git a/packages/addons/driver/sundtek-mediatv/addon b/packages/addons/driver/sundtek-mediatv/addon
index 2bf088c142..176c7ca208 100755
--- a/packages/addons/driver/sundtek-mediatv/addon
+++ b/packages/addons/driver/sundtek-mediatv/addon
@@ -31,4 +31,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
   cp -Pa $ROOT/$BUILD/sundtek_*/rootsys/opt/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -Pa $ROOT/$BUILD/sundtek_*/rootsys/opt/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  cp -Pa $ROOT/$BUILD/sundtek_*/rootsys/opt/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/
diff --git a/packages/addons/driver/sundtek-mediatv/config/device_attach_detach.sh b/packages/addons/driver/sundtek-mediatv/config/device_attach_detach.sh
old mode 100644
new mode 100755
index 201f5c78f8..3e31ba483f
--- a/packages/addons/driver/sundtek-mediatv/config/device_attach_detach.sh
+++ b/packages/addons/driver/sundtek-mediatv/config/device_attach_detach.sh
@@ -12,8 +12,6 @@ MUMUDVB=0
 ADDON_DIR="/storage/.xbmc/addons/driver.dvb.sundtek-mediatv"
 ADDON_HOME="/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
 ATTACH_DETACH_LOG="$ADDON_HOME/attach_detach.log"
-#ATTACH_DETACH_LOG="/dev/null"
-SUNDTEK_COUNTER_FILE="/var/run/sundtek-mediatv.counter"
 
 wait_process() {
   while [ -n "$(pidof $1)" ]; do
@@ -25,19 +23,15 @@ wait_process() {
   echo "Date: `date`"               >>$ATTACH_DETACH_LOG
   echo "Params: action=$1 devid=$2" >>$ATTACH_DETACH_LOG
 
-  . $SUNDTEK_COUNTER_FILE
-
   case "$1" in
     attach)
-      let SUNDTEK_COUNTER++
-      echo "SUNDTEK_COUNTER=$SUNDTEK_COUNTER" >$SUNDTEK_COUNTER_FILE
       export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ADDON_DIR/lib
       export LD_PRELOAD=$LD_PRELOAD:$ADDON_DIR/lib/libmediaclient.so
 
 (
       # save adapter serial number (in background)
       sleep 2
-      serial_number=` mediaclient -e | awk '/device / {printf("%s\n", $0)} /ID:/ {printf("  serial: %s\n\n", $2)}'`
+      serial_number=`mediaclient -e | awk '/ID:/ {print $2}'`
       if [ ! -f $ADDON_HOME/adapter_serial_number.txt ]; then
         echo -n "$serial_number" >$ADDON_HOME/adapter_serial_number.txt
       else
@@ -50,15 +44,8 @@ wait_process() {
       ;;
 
     detach)
-      let SUNDTEK_COUNTER--
-      echo "SUNDTEK_COUNTER=$SUNDTEK_COUNTER" >$SUNDTEK_COUNTER_FILE
-      if [ "$SUNDTEK_COUNTER" = "0" ] ; then
-        export LD_LIBRARY_PATH=${LD_LIBRARY_PATH//:$ADDON_DIR\/lib/}
-        export LD_PRELOAD=${LD_PRELOAD//:$ADDON_DIR\/lib\/libmediaclient.so/}
-      else
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ADDON_DIR/lib
-        export LD_PRELOAD=$LD_PRELOAD:$ADDON_DIR/lib/libmediaclient.so
-      fi
+      export LD_LIBRARY_PATH=${LD_LIBRARY_PATH//:$ADDON_DIR\/lib/}
+      export LD_PRELOAD=${LD_PRELOAD//:$ADDON_DIR\/lib\/libmediaclient.so/}
       ;;
 
     *)
@@ -66,7 +53,6 @@ wait_process() {
       ;;
   esac
 
-  echo "SUNDTEK_COUNTER=$SUNDTEK_COUNTER" >>$ATTACH_DETACH_LOG
   echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >>$ATTACH_DETACH_LOG
   echo "LD_PRELOAD=$LD_PRELOAD"           >>$ATTACH_DETACH_LOG
 
diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/meta
old mode 100644
new mode 100755
index 0e08612c93..f8b32338f1
--- a/packages/addons/driver/sundtek-mediatv/meta
+++ b/packages/addons/driver/sundtek-mediatv/meta
@@ -20,13 +20,13 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="1.90"
-PKG_REV="0"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
 PKG_DEPENDS="sundtek"
-PKG_BUILD_DEPENDS="toolchain sundtek"
+PKG_BUILD_DEPENDS="sundtek"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.service b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.service
old mode 100644
new mode 100755
index 2d01c6b650..f6ff92eec7
--- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.service
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.service
@@ -23,7 +23,6 @@
 ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
 SUNDTEK_CONFIG_FILE="$ADDON_HOME/sundtek.conf"
-SUNDTEK_COUNTER_FILE="/var/run/sundtek-mediatv.counter"
 
 mkdir -p $ADDON_HOME
 
@@ -43,9 +42,7 @@ fi
 SUNDTEK_ARG="--pluginpath=$ADDON_DIR/bin --daemon"
 
 if [ -z "$(pidof mediasrv)" ]; then
-  mkdir -p /var/run
-  echo "SUNDTEK_COUNTER=0" >$SUNDTEK_COUNTER_FILE
-  echo -n "" >$ADDON_HOME/attach_detach.log
+  rm $ADDON_HOME/attach_detach.log
   ln -sf $SUNDTEK_CONFIG_FILE /tmp/sundtek.conf
   mediasrv $SUNDTEK_ARG
 fi
diff --git a/packages/addons/driver/sundtek-mediatv/source/default.py b/packages/addons/driver/sundtek-mediatv/source/default.py
old mode 100644
new mode 100755
diff --git a/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
index 5f6dcd8ac6..151d8c0ff4 100755
--- a/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
+++ b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
@@ -30,16 +30,16 @@ case "$1" in
     if [ -n "$(pidof mediasrv)" ]; then
       progress "Shutting down Sundtek MediaTV DVB driver for suspending..."
       mkdir -p "$LOCKDIR"
-      touch "$LOCKDIR/${LOCKFILE}"
+      touch "$LOCKDIR/$LOCKFILE"
       mediaclient --shutdown
     fi
     ;;
 
   thaw|resume)
-    if [ -f "$LOCKDIR/${LOCKFILE}" ]; then
+    if [ -f "$LOCKDIR/$LOCKFILE" ]; then
       progress "Restarting Sundtek MediaTV DVB driver for wakeup..."
       sundtek-mediatv.service
-      rm -rf "$LOCKDIR/${LOCKFILE}"
+      rm -rf "$LOCKDIR/$LOCKFILE"
     fi
     ;;