Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,6 @@
+3.0.11
+- improve suspend/resume
+
 3.0.10
 - fix preloading capmt.so with sundtek
 - added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL

packages/addons/service/multimedia/tvheadend/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.4"
-PKG_REV="10"
+PKG_REV="11"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power

@@ -50,6 +50,14 @@ case "$1" in
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
+      tvheadend.stop
+      for seq in `seq 1 10` ; do
+        if [ ! "$(pidof tvheadend)" ];then
+          break
+        fi
+        usleep 500000
+      done
+      killall -9 tvheadend &>/dev/null
       rm -rf "$LOCKFILE"
       tvheadend.start
     fi

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,6 @@
+3.0.10
+- improve suspend/resume
+
 3.0.9
 - rebuild
 

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="3.0"
-PKG_REV="9"
+PKG_REV="10"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power

@@ -50,6 +50,14 @@ case "$1" in
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
+      vdr.stop
+      for seq in `seq 1 10` ; do
+        if [ ! "$(pidof vdr.bin)" ];then
+          break
+        fi
+        usleep 500000
+      done
+      killall -9 vdr.bin &>/dev/null
       rm -rf "$LOCKFILE"
       vdr.start
     fi

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,3 +1,7 @@
+3.0.12
+- update to oscam-8695
+- improve suspend/resume
+
 3.0.11
 - update to oscam-8678
 

packages/addons/service/softcam/oscam/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="8678"
+PKG_VERSION="8695"
-PKG_REV="11"
+PKG_REV="12"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"

packages/addons/service/softcam/oscam/source/sleep.d/oscam.power

@@ -41,6 +41,14 @@ if [ "$RESTART_ON_RESUME" == "true" ] ; then
     thaw|resume)
       progress "Restarting oscam for wakeup..."
       if [ -f "$LOCKFILE" ] ; then
+        oscam.stop
+        for seq in `seq 1 10` ; do
+          if [ ! "$(pidof oscam)" ];then
+            break
+          fi
+          usleep 500000
+        done
+        killall -9 oscam &>/dev/null
         rm -rf "$LOCKFILE"
         oscam.start
       fi

packages/network/connman/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="0515b22"
+PKG_VERSION="475a695"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/busybox/config/busybox.conf

@@ -104,7 +104,7 @@ CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_HISTORY=200
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
 CONFIG_FEATURE_REVERSE_SEARCH=y