Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -134,9 +134,9 @@ mkdir -p $ADDON_HOME
       fi
       if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
         logger -t Tvheadend "### Preloading capmt_ca.so library ###"
-        LD_PRELOAD=$ADDON_DIR/bin/capmt_ca.so $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+        LD_PRELOAD=$ADDON_DIR/bin/capmt_ca.so exec $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
       else
-        $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+        exec $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
       fi
     done &
   fi

packages/debug/acpica/build

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+[ "$TARGET_ARCH" = "i386" ] && ACPICA_BITS="32"
+[ "$TARGET_ARCH" = "x86_64" ] && ACPICA_BITS="64"
+
+cd $PKG_BUILD
+make PREFIX=/usr \
+     CC="$TARGET_CC" \
+     AR="$TARGET_AR" \
+     BITS=$ACPICA_BITS \
+     YACC=$ROOT/$TOOLCHAIN/bin/bison
+     CWARNINGFLAGS="-O2 $TARGET_CFLAGS" \

packages/debug/acpica/install

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+[ "$TARGET_ARCH" = "i386" ] && ACPICA_BIN="bin32"
+[ "$TARGET_ARCH" = "x86_64" ] && ACPICA_BIN="bin64"
+
+mkdir -p $INSTALL/usr/bin/
+  cp $PKG_BUILD/generate/unix/$ACPICA_BIN/* $INSTALL/usr/bin/

packages/debug/acpica/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="acpica-unix2"
+PKG_VERSION="20130117"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.acpica.org/"
+PKG_URL="https://www.acpica.org/download/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain flex bison"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="acpica: A set of tools to disassemble ACPI tables"
+PKG_LONGDESC="acpica is a set of tools from Intel to disassemble ACPI tables."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/debug/dmidecode/build

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+make PREFIX=/usr \
+     CC="$TARGET_CC" \
+     AR="$TARGET_AR" \
+     CFLAGS="$TARGET_CFLAGS" \
+     CPPFLAGS="$TARGET_CPPFLAGS" \

packages/debug/dmidecode/install

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/bin/
+  cp $PKG_BUILD/{biosdecode,dmidecode,ownership,vpddecode} $INSTALL/usr/bin/

packages/debug/dmidecode/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="dmidecode"
+PKG_VERSION="2.11"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.nongnu.org/dmidecode/"
+PKG_URL="http://download.savannah.gnu.org/releases/dmidecode/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="dmidecode: report DMI information"
+PKG_LONGDESC="Dmidecode reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard (see a sample output). This information typically includes system manufacturer, model name, serial number, BIOS version, asset tag as well as a lot of other details of varying level of interest and reliability depending on the manufacturer. This will often include usage status for the CPU sockets, expansion slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of I/O ports (e.g. serial, parallel, USB)."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/debug/i2c-tools/build

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+make PREFIX=/usr \
+     CC="$TARGET_CC" \
+     AR="$TARGET_AR" \
+     CFLAGS="$TARGET_CFLAGS" \
+     CPPFLAGS="$TARGET_CPPFLAGS" \

packages/debug/i2c-tools/install

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/bin/
+  cp $PKG_BUILD/tools/{i2cdetect,i2cdump,i2cget,i2cset} $INSTALL/usr/bin/
+  cp $PKG_BUILD/stub/i2c-stub-from-dump $INSTALL/usr/bin/

packages/debug/i2c-tools/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="i2c-tools"
+PKG_VERSION="3.1.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.lm-sensors.org/wiki/I2CTools"
+PKG_URL="http://dl.lm-sensors.org/i2c-tools/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="i2c-tools: bus probing tool, eeprom decoding/programming and SMBus python interface"
+PKG_LONGDESC="The i2c-tools package contains a heterogeneous set of I2C tools for Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers, EEPROM decoding scripts, EEPROM programming tools, and a python module for SMBus access."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/debug/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb"
+PKG_DEPENDS="acpica strace gdb dmidecode i2c-tools pmtools"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/debug/pmtools/build

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+make PREFIX=/usr \
+     CC="$TARGET_CC" \
+     AR="$TARGET_AR" \
+     CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \
+     CPPFLAGS="$TARGET_CPPFLAGS" \

packages/debug/pmtools/install

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/bin/
+  cp $PKG_BUILD/acpidump/acpidump $INSTALL/usr/bin/
+  cp $PKG_BUILD/acpixtract/acpixtract $INSTALL/usr/bin/
+  cp $PKG_BUILD/madt/madt $INSTALL/usr/bin/

packages/debug/pmtools/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="pmtools"
+PKG_VERSION="20071116"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="GPL"
+PKG_SITE="https://lesswatts.org/projects/acpi/utilities.php"
+PKG_URL="https://lesswatts.org/patches/linux_acpi/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="pmtools: ACPI debugging utilities"
+PKG_LONGDESC="The pmtools package contains tools to debug ACPI DSDT tables"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/mediacenter/xbmc/patches/xbmc-801-watchdog.patch

@@ -0,0 +1,171 @@
+commit 2349687bee7a4b01cd8f17c81ed5d77ee95449f6
+Author: Lars Op den Kamp <lars@opdenkamp.eu>
+Date:   Wed Jan 16 02:11:19 2013 +0100
+
+    ODK: watchdog for linux, 30 second timeout by default
+
+diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
+index b453e9f..8471e3b 100644
+--- a/xbmc/Application.cpp
++++ b/xbmc/Application.cpp
+@@ -18,6 +18,11 @@
+  *
+  */
+ 
++#if defined(_LINUX)
++#include <sys/ioctl.h>
++#include <linux/watchdog.h>
++#endif
++
+ #include "network/Network.h"
+ #include "threads/SystemClock.h"
+ #include "system.h"
+@@ -436,6 +441,7 @@ CApplication::CApplication(void)
+   m_lastFrameTime = 0;
+   m_lastRenderTime = 0;
+   m_bTestMode = false;
++  m_iWatchdogFD = -1;
+ }
+ 
+ CApplication::~CApplication(void)
+@@ -565,6 +571,51 @@ void CApplication::Preflight()
+ #endif
+ }
+ 
++void CApplication::WDOpen(void)
++{
++#if defined(_LINUX)
++  m_iWatchdogFD = open("/dev/watchdog", O_WRONLY);
++  if (m_iWatchdogFD == -1)
++  {
++    CLog::Log(LOGWARNING, "could not open /dev/watchdog");
++    return;
++  }
++
++  if (ioctl(m_iWatchdogFD, WDIOC_SETTIMEOUT, &g_advancedSettings.m_iWatchdogTimeoutSeconds))
++  {
++    CLog::Log(LOGERROR, "ioctl on /dev/watchdog failed");
++    WDClose();
++  }
++
++  CLog::Log(LOGINFO, "watchdog started, %d second timeout", g_advancedSettings.m_iWatchdogTimeoutSeconds);
++#endif
++}
++
++void CApplication::WDClose(void)
++{
++#if defined(_LINUX)
++  if (m_iWatchdogFD != -1)
++  {
++    struct watchdog_info watchdogInfo;
++    if (!ioctl(m_iWatchdogFD, WDIOC_GETSUPPORT, &watchdogInfo) &&
++        (WDIOF_MAGICCLOSE & watchdogInfo.options))
++      write(m_iWatchdogFD, "V", 1);
++    close(m_iWatchdogFD);
++    m_iWatchdogFD = -1;
++
++    CLog::Log(LOGINFO, "watchdog stopped");
++  }
++#endif
++}
++
++void CApplication::WDAlive(void)
++{
++#if defined(_LINUX)
++  if (m_iWatchdogFD != -1)
++    ioctl(m_iWatchdogFD, WDIOC_KEEPALIVE, NULL);
++#endif
++}
++
+ bool CApplication::Create()
+ {
+ #if defined(HAS_LINUX_NETWORK)
+@@ -776,6 +827,8 @@ bool CApplication::Create()
+ 
+   g_mediaManager.Initialize();
+ 
++  WDOpen();
++
+   m_lastFrameTime = XbmcThreads::SystemClockMillis();
+   m_lastRenderTime = m_lastFrameTime;
+   return true;
+@@ -3641,6 +3694,8 @@ void CApplication::Stop(int exitCode)
+   // so we may never get to Destroy() in CXBApplicationEx::Run(), we call it here.
+   Destroy();
+ 
++  WDClose();
++
+   //
+   Sleep(200);
+ }
+@@ -5232,6 +5287,8 @@ void CApplication::ProcessSlow()
+     CAddonInstaller::Get().UpdateRepos();
+ 
+   CAEFactory::GarbageCollect();
++
++  WDAlive();
+ }
+ 
+ // Global Idle Time in Seconds
+diff --git a/xbmc/Application.h b/xbmc/Application.h
+index 69609fa..de04517 100644
+--- a/xbmc/Application.h
++++ b/xbmc/Application.h
+@@ -458,6 +458,10 @@ protected:
+   bool InitDirectoriesWin32();
+   void CreateUserDirs();
+ 
++  void WDOpen(void);
++  void WDClose(void);
++  void WDAlive(void);
++
+   CSeekHandler *m_seekHandler;
+   CInertialScrollingHandler *m_pInertialScrollingHandler;
+   CNetwork    *m_network;
+@@ -469,6 +473,7 @@ protected:
+   std::map<std::string, std::map<int, float> > m_lastAxisMap;
+ #endif
+ 
++  int m_iWatchdogFD;
+ };
+ 
+ XBMC_GLOBAL_REF(CApplication,g_application);
+diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
+index 16800b7..3b0cc5a 100644
+--- a/xbmc/settings/AdvancedSettings.cpp
++++ b/xbmc/settings/AdvancedSettings.cpp
+@@ -322,6 +322,8 @@ void CAdvancedSettings::Initialize()
+   m_databaseVideo.Reset();
+ 
+   m_logLevelHint = m_logLevel = LOG_LEVEL_NORMAL;
++
++  m_iWatchdogTimeoutSeconds = 30;
+ }
+ 
+ bool CAdvancedSettings::Load()
+@@ -990,6 +992,12 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
+     XMLUtils::GetInt(pPVR, "numericchannelswitchtimeout", m_iPVRNumericChannelSwitchTimeout, 50, 60000);
+   }
+ 
++  TiXmlElement *pWD = pRootElement->FirstChildElement("watchdog");
++  if (pWD)
++  {
++    XMLUtils::GetInt(pWD, "timeout", m_iWatchdogTimeoutSeconds, 1, 6000);
++  }
++
+   XMLUtils::GetBoolean(pRootElement, "measurerefreshrate", m_measureRefreshrate);
+ 
+   TiXmlElement* pDatabase = pRootElement->FirstChildElement("videodatabase");
+diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
+index 27887d4..a155369 100644
+--- a/xbmc/settings/AdvancedSettings.h
++++ b/xbmc/settings/AdvancedSettings.h
+@@ -365,6 +365,8 @@ class CAdvancedSettings
+     bool m_initialized;
+ 
+     void SetDebugMode(bool debug);
++
++    int m_iWatchdogTimeoutSeconds;
+ };
+ 
+ XBMC_GLOBAL(CAdvancedSettings,g_advancedSettings);

packages/sysutils/busybox/init.d/08_syslogd

@@ -25,7 +25,11 @@
 
 (
   progress "Starting Syslog daemon"
+  if [ -f /storage/.config/syslog.conf ]; then
+    syslogd -f /storage/.config/syslog.conf
+  else
     syslogd
+  fi
 
   progress "Starting Kernellog daemon"
     klogd

packages/sysutils/remote/atvclient/init.d/63_atvclient

@@ -24,6 +24,6 @@
 
 (
   progress "starting ATVclient"
-    mkdir -p /storage/.cache
-    atvclient -m > /dev/null 2>&1
+  mkdir -p /storage/.cache
+  exec atvclient -m > /dev/null 2>&1
 )&

packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules

@@ -95,9 +95,13 @@ ENV{ID_VENDOR_ID}=="046e", ENV{ID_MODEL_ID}=="5578", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="topseed.evmap"
 
+ENV{ID_VENDOR_ID}=="04b4", ENV{ID_MODEL_ID}=="0100", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="cypress.evmap"
+
 ENV{ID_VENDOR_ID}=="04b4", ENV{ID_MODEL_ID}=="0101", \
   ENV{eventlircd_enable}="true", \
-  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
+  ENV{eventlircd_evmap}="cypress.evmap"
 
 ENV{ID_VENDOR_ID}=="04f2", ENV{ID_MODEL_ID}=="0618", \
   ENV{eventlircd_enable}="true", \

packages/sysutils/systemd/init.d/12_udev-monitor

@@ -25,5 +25,5 @@
 
 (
   progress "monitoring udev events"
-    udevadm monitor -e > /dev/udev.log
+  exec udevadm monitor -e > /dev/udev.log
 )&

packages/x11/other/ratpoison/init.d/73_ratpoison

@@ -30,8 +30,8 @@
 
   # starting ratpoison
     if [ -f /storage/.config/ratpoisonrc ]; then
-      DISPLAY=:0.0 ratpoison -f /storage/.config/ratpoisonrc > /dev/null 2>&1
+      exec ratpoison -f /storage/.config/ratpoisonrc -d :0.0 > /dev/null 2>&1
     else
-      DISPLAY=:0.0 ratpoison > /dev/null 2>&1
+      exec ratpoison -d :0.0 > /dev/null 2>&1
     fi
 )&

projects/ARCTIC_MC/linux/linux.x86_64.conf

@@ -1843,7 +1843,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/ATV/linux/linux.i386.conf

@@ -1799,7 +1799,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Fusion/linux/linux.i386.conf

@@ -2033,7 +2033,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Fusion/linux/linux.x86_64.conf

@@ -1986,7 +1986,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Generic/linux/linux.i386.conf

@@ -2118,7 +2118,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Generic_OSS/linux/linux.i386.conf

@@ -2116,7 +2116,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/ION/linux/linux.i386.conf

@@ -1987,7 +1987,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/ION/linux/linux.x86_64.conf

@@ -1924,7 +1924,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Intel/linux/linux.i386.conf

@@ -2004,7 +2004,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Intel/linux/linux.x86_64.conf

@@ -1942,7 +1942,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/RPi/linux/linux.arm.conf

@@ -1538,7 +1538,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Ultra/linux/linux.x86_64.conf

@@ -1843,7 +1843,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Virtual/linux/linux.i386.conf

@@ -2006,7 +2006,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m

projects/Virtual/linux/linux.x86_64.conf

@@ -1943,7 +1943,7 @@ CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
-# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_PCTV452E=m