From 22fa06ee571c2fd8022036c437fb5d9733415021 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 25 May 2013 22:24:22 +0300 Subject: [PATCH 1/5] linux-tbs-drivers: rename to 'tbs-linux-drivers' --- .../{linux-tbs-drivers => tbs-linux-drivers}/build | 0 .../{linux-tbs-drivers => tbs-linux-drivers}/install | 0 .../linux-drivers/{linux-tbs-drivers => tbs-linux-drivers}/meta | 2 +- .../{linux-tbs-drivers => tbs-linux-drivers}/unpack | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux-drivers/{linux-tbs-drivers => tbs-linux-drivers}/build (100%) rename packages/linux-drivers/{linux-tbs-drivers => tbs-linux-drivers}/install (100%) rename packages/linux-drivers/{linux-tbs-drivers => tbs-linux-drivers}/meta (98%) rename packages/linux-drivers/{linux-tbs-drivers => tbs-linux-drivers}/unpack (100%) diff --git a/packages/linux-drivers/linux-tbs-drivers/build b/packages/linux-drivers/tbs-linux-drivers/build similarity index 100% rename from packages/linux-drivers/linux-tbs-drivers/build rename to packages/linux-drivers/tbs-linux-drivers/build diff --git a/packages/linux-drivers/linux-tbs-drivers/install b/packages/linux-drivers/tbs-linux-drivers/install similarity index 100% rename from packages/linux-drivers/linux-tbs-drivers/install rename to packages/linux-drivers/tbs-linux-drivers/install diff --git a/packages/linux-drivers/linux-tbs-drivers/meta b/packages/linux-drivers/tbs-linux-drivers/meta similarity index 98% rename from packages/linux-drivers/linux-tbs-drivers/meta rename to packages/linux-drivers/tbs-linux-drivers/meta index ad6a430ff9..330df6e602 100644 --- a/packages/linux-drivers/linux-tbs-drivers/meta +++ b/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" diff --git a/packages/linux-drivers/linux-tbs-drivers/unpack b/packages/linux-drivers/tbs-linux-drivers/unpack similarity index 100% rename from packages/linux-drivers/linux-tbs-drivers/unpack rename to packages/linux-drivers/tbs-linux-drivers/unpack From 698753897f1771f9dd692f5df4bf09e2d099780e Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 23 May 2013 19:23:03 +0200 Subject: [PATCH 2/5] vdr-plugin-xmltv2vdr: use VDR_CACHE_DIR for epg.db --- .../addons/service/multimedia/vdr-addon/source/bin/vdr.start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index ead94ab7b9..cf6e089715 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -111,7 +111,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 ( From e7bc03a43371c6b09ec8e61e4efc1bd96e52bd60 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 26 May 2013 12:34:29 +0300 Subject: [PATCH 3/5] vdr: use own /var/run/vdr tmpfs mount --- .../service/multimedia/vdr-addon/source/bin/vdr.start | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index cf6e089715..be346a7f48 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/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" @@ -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 From a906e45c5b8c45c907c4a02757c71a6bdc04b931 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 26 May 2013 12:36:20 +0300 Subject: [PATCH 4/5] vdr: update changelog --- packages/addons/service/multimedia/vdr-addon/changelog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 620a99f0b9..f88f5832af 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/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 From 74f176e3de2151bb98a846f295d8a6a8c240b082 Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Sun, 26 May 2013 17:07:46 +0200 Subject: [PATCH 5/5] pm-utils: added module r8712u to SUSPEND_MODULES, fixes #2307 --- packages/sysutils/pm-utils/config.d/module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/pm-utils/config.d/module b/packages/sysutils/pm-utils/config.d/module index d65d769567..d8c4e9ad58 100644 --- a/packages/sysutils/pm-utils/config.d/module +++ b/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"