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

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

@@ -1,3 +1,7 @@
+3.0.8 (in progress
+- vdr-plugin-xmltv2vdr: use VDR_CACHE_DIR for epg.db
+- use own /var/run/vdr tmpfs mount
+
 3.0.7
 - update to vdr-plugin-xmltv2vdr-30903cc0
 - cleanup epgsources handling

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -22,6 +22,14 @@
 
 . /etc/profile
 
+check_tmpfs_mount() {
+  grep " /var/run/vdr " /proc/mounts >/dev/null
+  if [ $? -ne 0 ] ; then
+    mkdir -p /var/run/vdr
+    mount -t tmpfs -o size=10% tmpfs /var/run/vdr
+  fi
+}
+
 LOCKDIR="/var/lock/"
 LOCKFILE="vdr.disabled"
 
@@ -111,7 +119,7 @@ if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P epgsearch"
 fi
 if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P xmltv2vdr"
+  VDR_ARG="$VDR_ARG -P 'xmltv2vdr --epgfile=$ADDON_CACHE_DIR/epg.db'"
 fi
 
 (
@@ -153,6 +161,7 @@ if [ ! "$(pidof vdr.bin)" ];then
   fi
   while [ true ] ; do
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
+      umount /var/run/vdr 2>&1
       break
     fi
     # (wait for) at least 1 adapter (xbmc allows to set 0)
@@ -161,6 +170,7 @@ if [ ! "$(pidof vdr.bin)" ];then
       sleep 1
       continue
     fi
+    check_tmpfs_mount
     LANG=en_US.UTF-8 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval vdr.bin $VDR_ARG &>$LOG_FILE
   done &
 fi

packages/linux-drivers/tbs-linux-drivers/meta

@@ -18,7 +18,7 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="linux-tbs-drivers"
+PKG_NAME="tbs-linux-drivers"
 PKG_VERSION="130506"
 PKG_REV="1"
 PKG_ARCH="any"

packages/sysutils/pm-utils/config.d/module

@@ -1 +1 @@
-SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon"
+SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u"