From 47aa71a12f6b4bfad907b1ec42e02d265e5c9834 Mon Sep 17 00:00:00 2001 From: Bas Spaans Date: Sun, 25 Mar 2012 12:13:45 +0200 Subject: [PATCH 1/4] projects/*/linux/linux.*.conf: added lirc_serial support to Fusion/Generic*/Intel/ION builds. --- projects/Fusion/linux/linux.i386.conf | 3 ++- projects/Fusion/linux/linux.x86_64.conf | 3 ++- projects/Generic/linux/linux.i386.conf | 3 ++- projects/Generic_OSS/linux/linux.i386.conf | 3 ++- projects/ION/linux/linux.i386.conf | 3 ++- projects/ION/linux/linux.x86_64.conf | 3 ++- projects/Intel/linux/linux.i386.conf | 3 ++- projects/Intel/linux/linux.x86_64.conf | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 82e315e1b9..9db06acca3 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -2764,7 +2764,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index bb95f67fa6..9525c9fd9b 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -2710,7 +2710,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 165d3129c6..3b06d15a72 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -2937,7 +2937,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 201dd87f51..08b9c6d710 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -2939,7 +2939,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index b950b07e12..a978571f39 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -2763,7 +2763,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 5541dd8dcf..0fe55093eb 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -2700,7 +2700,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 4d8dfe36e2..278acf8358 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -2824,7 +2824,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 426dd5850b..f2272811eb 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -2762,7 +2762,8 @@ CONFIG_LIRC_STAGING=y CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set # CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set # CONFIG_LIRC_TTUSBIR is not set # CONFIG_LIRC_ZILOG is not set From 6d5acd6aaf22ba825a3367088db1ada9a1971773 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 25 Mar 2012 14:29:47 +0300 Subject: [PATCH 2/4] tvheadend: add an option to wait for fe initialization --- .../multimedia/hts-tvheadend/config/settings.xml | 1 + .../hts-tvheadend/source/bin/tvheadend.start | 12 ++++++++++++ .../source/resources/language/English/strings.xml | 1 + .../hts-tvheadend/source/resources/settings.xml | 1 + 4 files changed, 15 insertions(+) diff --git a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml index 0cb958058d..71317cd4ce 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml +++ b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml @@ -1,4 +1,5 @@ + diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start index ae69147e6c..796369e49e 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start @@ -54,6 +54,14 @@ fi TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +mkdir -p /var/config +cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default +cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf + +. /var/config/tvheadend.conf.default +. /var/config/tvheadend.conf + + mkdir -p $ADDON_HOME if [ ! "$(pidof $ADDON_BIN)" ]; then # start userspace DVB driver/addon @@ -72,6 +80,10 @@ mkdir -p $ADDON_HOME if [ -f "$LOCKDIR/$LOCKFILE" ] ; then break fi + if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then + sleep 1 + continue + fi $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE done & fi diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml index 92b655ff1a..3b6c054e15 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml @@ -10,5 +10,6 @@ XMLTV Web location DVB Configuration Unload DVB mudules before suspend + Wait for frontend initialization diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml index 12666cf0dd..59ff7fde8b 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml +++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml @@ -12,6 +12,7 @@ + From ca60559882ca682d33deb896ad63c0014317b3ee Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 25 Mar 2012 14:31:03 +0300 Subject: [PATCH 3/4] vdr-addon: add an option to wait for fe initialization --- .../addons/service/multimedia/vdr-addon/config/settings.xml | 1 + .../addons/service/multimedia/vdr-addon/source/bin/vdr.start | 4 ++++ .../vdr-addon/source/resources/language/English/strings.xml | 1 + .../multimedia/vdr-addon/source/resources/settings.xml | 1 + 4 files changed, 7 insertions(+) diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 7898be9965..b69e9636bb 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -1,4 +1,5 @@ + 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 cd8f48c254..06bc1e4a5d 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -101,6 +101,10 @@ if [ ! "$(pidof vdr.bin)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then break fi + if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then + sleep 1 + continue + fi LANG=en_US.UTF-8 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" vdr.bin $VDR_ARG &>$LOG_FILE done & fi diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index 54b9fe5b35..d496033fdf 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -4,6 +4,7 @@ Plugins DVB Configuration Unload DVB mudules before suspend + Wait for frontend initialization Plugin Configuration Enable plugin: iptv Enable plugin: streamdev-client diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index db8a2945c1..d12777bf7c 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -3,6 +3,7 @@ + From a426b42bc153ccce3506390c0b06ed3d2f7c1d16 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 25 Mar 2012 15:31:33 +0300 Subject: [PATCH 4/4] SABnzbd-Suite: service startup fix --- .../SABnzbd-Suite/source/default.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py index f4a1caead5..eba995f350 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py @@ -18,6 +18,21 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -import xbmc, time, os, subprocess +import os +import sys +import xbmcaddon +import time +import subprocess +import xbmc -subprocess.Popen("SABnzbd-Suite.service", shell=True, close_fds=True) +__scriptname__ = "SABnzbd Suite" +__author__ = "OpenELEC" +__url__ = "http://www.openelec.tv" +__settings__ = xbmcaddon.Addon(id='service.downloadmanager.SABnzbd-Suite') +__cwd__ = __settings__.getAddonInfo('path') +__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.service") ) + +#make binary files executable in adson bin folder +subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) + +subprocess.Popen(__path__, shell=True, close_fds=True)