From 482eaffcb261d44efb75ba253de77daa103260f1 Mon Sep 17 00:00:00 2001
From: vpeter4 <peter.vicman@gmail.com>
Date: Wed, 6 Feb 2013 20:26:27 +0100
Subject: [PATCH 01/16] linux: support Opera1 DVB-S USB2.0 receiver, this fix
 #1734

---
 projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +-
 projects/ATV/linux/linux.i386.conf         | 2 +-
 projects/Fusion/linux/linux.i386.conf      | 2 +-
 projects/Fusion/linux/linux.x86_64.conf    | 2 +-
 projects/Generic/linux/linux.i386.conf     | 2 +-
 projects/Generic_OSS/linux/linux.i386.conf | 2 +-
 projects/ION/linux/linux.i386.conf         | 2 +-
 projects/ION/linux/linux.x86_64.conf       | 2 +-
 projects/Intel/linux/linux.i386.conf       | 2 +-
 projects/Intel/linux/linux.x86_64.conf     | 2 +-
 projects/RPi/linux/linux.arm.conf          | 2 +-
 projects/Ultra/linux/linux.x86_64.conf     | 2 +-
 projects/Virtual/linux/linux.i386.conf     | 2 +-
 projects/Virtual/linux/linux.x86_64.conf   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf
index 1974941d1a..66229f86a3 100644
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/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
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index 5570292849..abc2a3d5cc 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/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
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index 83f5c49acd..68e2578810 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/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
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
index c555c3ec4d..301d786f9e 100644
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/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
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 1946a92c6e..6d69ca937a 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/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
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index 7a850c37ae..aff1b26e5b 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/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
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 2c81c67b34..4d342f7204 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/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
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index c88c50f7b7..eb5210db53 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/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
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index 9e50109638..004377e15b 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/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
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index af57a14d86..190ce1ced0 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/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
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 0f0b78147a..ef2cd3f575 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/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
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index f2e3e58381..7de2ef00f3 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/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
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index ad75b2f3f8..0be1af7db7 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/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
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index 1127dbf4fb..ff0b54a0ca 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/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

From 6f41b37996add7ec9179ccf4e45c5237697015c0 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 6 Feb 2013 22:16:12 +0100
Subject: [PATCH 02/16] When init starts daemons through a shell script,
 replace the shell altogether

A few daemons are being started from init through a shell script. Since the daemon does not "deamonizes" properly, it's been put in the background from the shell by using ( ... ) &, however this leaves a lingering shell that serves no purpose. This patch improves this situation.

The situation before this change looked like:

    init-+-Xorg
         |-avahi-daemon
         |-console-kit-dae-+-62*[{console-kit-da}]
         |                 `-{gdbus}
         |-dbus-daemon
         |-eventlircd
         |-klogd
:        |-init---atvclient
         |-init---connmand
:        |-init---ratpoison
:        |-init---udevadm
         |-polkitd---{gdbus}
         |-rpcbind
         |-sshd---sshd---sh---pstree
         |-syslogd
         |-systemd-udevd
:        |-tvheadend.start---tvheadend---12*[{tvheadend}]
         |-udisks-daemon-+-udisks-daemon
         |               |-{gdbus}
         |               `-{gmain}
         |-upowerd-+-{gdbus}
         |         `-{gmain}
         |-wpa_supplicant
         `-xbmc.bin---17*[{xbmc.bin}]

After this change, it looks like:

    init-+-Xorg
:        |-atvclient
         |-avahi-daemon
         |-console-kit-dae-+-62*[{console-kit-da}]
         |                 `-{gdbus}
         |-dbus-daemon
         |-eventlircd
         |-init---connmand
         |-klogd
         |-polkitd---{gdbus}
:        |-ratpoison
         |-rpcbind
         |-sshd---sshd---sh---pstree
         |-syslogd
         |-systemd-udevd
:        |-tvheadend---12*[{tvheadend}]
:        |-udevadm
         |-udisks-daemon-+-udisks-daemon
         |               |-{gdbus}
         |               `-{gmain}
         |-upowerd-+-{gdbus}
         |         `-{gmain}
         |-wpa_supplicant
         `-xbmc.bin---17*[{xbmc.bin}]

Only for connmand this is not easily done since the shell loops and restarts connmand. In different circumstances /etc/inittab would respawn the process.
---
 .../service/multimedia/tvheadend/source/bin/tvheadend.start   | 4 ++--
 packages/sysutils/remote/atvclient/init.d/63_atvclient        | 4 ++--
 packages/sysutils/systemd/init.d/12_udev-monitor              | 2 +-
 packages/x11/other/ratpoison/init.d/73_ratpoison              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index d39b22dc8f..3fa1dbfec5 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/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
diff --git a/packages/sysutils/remote/atvclient/init.d/63_atvclient b/packages/sysutils/remote/atvclient/init.d/63_atvclient
index 38d772f563..07f22742e2 100644
--- a/packages/sysutils/remote/atvclient/init.d/63_atvclient
+++ b/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
 )&
\ No newline at end of file
diff --git a/packages/sysutils/systemd/init.d/12_udev-monitor b/packages/sysutils/systemd/init.d/12_udev-monitor
index f380489255..77d3d77b0b 100644
--- a/packages/sysutils/systemd/init.d/12_udev-monitor
+++ b/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
 )&
diff --git a/packages/x11/other/ratpoison/init.d/73_ratpoison b/packages/x11/other/ratpoison/init.d/73_ratpoison
index c4846ace6e..7954754d97 100644
--- a/packages/x11/other/ratpoison/init.d/73_ratpoison
+++ b/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
 )&

From 8672ac5b63d99d26ce0eb9181d5e3c9d1a08b7c3 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 6 Feb 2013 22:36:53 +0100
Subject: [PATCH 03/16] Allow syslog.conf to be locally customized from
 /storage/.config/syslog.conf

Since I would like to remotely log whatever goes on on my AppleTV devices, I need a way to modify the syslog.conf that is used, or need to provide options to syslogd. This was the easiest pick of the two :)
---
 packages/sysutils/busybox/init.d/08_syslogd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/sysutils/busybox/init.d/08_syslogd b/packages/sysutils/busybox/init.d/08_syslogd
index e27f74db16..524c77d8cd 100644
--- a/packages/sysutils/busybox/init.d/08_syslogd
+++ b/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

From 12df4db25cdb2d4f41ef71b87dc9de9a26836189 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 6 Feb 2013 22:54:27 +0100
Subject: [PATCH 04/16] new package: add package 'dmidecode'

This packages adds the dmidecode tools when enabled.
---
 packages/sysutils/dmidecode/build   | 30 ++++++++++++++++++++++++
 packages/sysutils/dmidecode/install | 26 +++++++++++++++++++++
 packages/sysutils/dmidecode/meta    | 36 +++++++++++++++++++++++++++++
 projects/ATV/options                |  3 +++
 scripts/image                       |  3 +++
 5 files changed, 98 insertions(+)
 create mode 100755 packages/sysutils/dmidecode/build
 create mode 100755 packages/sysutils/dmidecode/install
 create mode 100644 packages/sysutils/dmidecode/meta

diff --git a/packages/sysutils/dmidecode/build b/packages/sysutils/dmidecode/build
new file mode 100755
index 0000000000..2469835fca
--- /dev/null
+++ b/packages/sysutils/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" \
diff --git a/packages/sysutils/dmidecode/install b/packages/sysutils/dmidecode/install
new file mode 100755
index 0000000000..943dbb7dcc
--- /dev/null
+++ b/packages/sysutils/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/
diff --git a/packages/sysutils/dmidecode/meta b/packages/sysutils/dmidecode/meta
new file mode 100644
index 0000000000..2d90c38cb1
--- /dev/null
+++ b/packages/sysutils/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="any"
+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"
diff --git a/projects/ATV/options b/projects/ATV/options
index 5432431588..c8748d5b22 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -309,6 +309,9 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with dmidecode support (yes / no)
+  DMIDECODE_SUPPORT="yes"
+
 # build with swap support (yes / no)
   SWAP_SUPPORT="yes"
 
diff --git a/scripts/image b/scripts/image
index dd46401e7a..ed70c69dce 100755
--- a/scripts/image
+++ b/scripts/image
@@ -135,6 +135,9 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 # Sensors support
   [ "$SENSOR_SUPPORT" = "yes" ] && $SCRIPTS/install lm_sensors
 
+# dmidecode support
+  [ "$DMIDECODE_SUPPORT" = "yes" ] && $SCRIPTS/install dmidecode
+
 # Update support
   [ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate
 

From 0b84f525f8b421e6fc5a9ef82046d328c985de1b Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 6 Feb 2013 23:00:17 +0100
Subject: [PATCH 05/16] new packages: add package 'pmtools' and 'acpica'

These packages add the necessary tools to debug and disassemble ACPI tables in order to understand and fix ACPI problems.
---
 packages/sysutils/acpica/build    | 31 ++++++++++++++++++++++++++
 packages/sysutils/acpica/install  | 26 ++++++++++++++++++++++
 packages/sysutils/acpica/meta     | 36 +++++++++++++++++++++++++++++++
 packages/sysutils/pmtools/build   | 30 ++++++++++++++++++++++++++
 packages/sysutils/pmtools/install | 28 ++++++++++++++++++++++++
 packages/sysutils/pmtools/meta    | 36 +++++++++++++++++++++++++++++++
 6 files changed, 187 insertions(+)
 create mode 100755 packages/sysutils/acpica/build
 create mode 100755 packages/sysutils/acpica/install
 create mode 100644 packages/sysutils/acpica/meta
 create mode 100755 packages/sysutils/pmtools/build
 create mode 100755 packages/sysutils/pmtools/install
 create mode 100644 packages/sysutils/pmtools/meta

diff --git a/packages/sysutils/acpica/build b/packages/sysutils/acpica/build
new file mode 100755
index 0000000000..03721d7a32
--- /dev/null
+++ b/packages/sysutils/acpica/build
@@ -0,0 +1,31 @@
+#!/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" \
+     BITS="32" \
+     YACC=$ROOT/$TOOLCHAIN/bin/bison
+     CWARNINGFLAGS="-O2 $TARGET_CFLAGS" \
diff --git a/packages/sysutils/acpica/install b/packages/sysutils/acpica/install
new file mode 100755
index 0000000000..95d2fd4e36
--- /dev/null
+++ b/packages/sysutils/acpica/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/generate/unix/bin32/* $INSTALL/usr/bin/
diff --git a/packages/sysutils/acpica/meta b/packages/sysutils/acpica/meta
new file mode 100644
index 0000000000..4086abf04d
--- /dev/null
+++ b/packages/sysutils/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="any"
+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"
diff --git a/packages/sysutils/pmtools/build b/packages/sysutils/pmtools/build
new file mode 100755
index 0000000000..4f255b7072
--- /dev/null
+++ b/packages/sysutils/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" \
diff --git a/packages/sysutils/pmtools/install b/packages/sysutils/pmtools/install
new file mode 100755
index 0000000000..403b128126
--- /dev/null
+++ b/packages/sysutils/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/
diff --git a/packages/sysutils/pmtools/meta b/packages/sysutils/pmtools/meta
new file mode 100644
index 0000000000..6e7bc25a7b
--- /dev/null
+++ b/packages/sysutils/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="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://lesswatts.org/projects/acpi/utilities.php"
+PKG_URL="https://lesswatts.org/patches/linux_acpi/pmtools-20071116.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"

From c5b63fe01a10949cef37abe4e9af39b093213aea Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 6 Feb 2013 23:04:56 +0100
Subject: [PATCH 06/16] new package: add package 'i2c-tools'

This package adds the necessary tools to debug i2c hardware.
---
 packages/sysutils/i2c-tools/build   | 30 ++++++++++++++++++++++++
 packages/sysutils/i2c-tools/install | 27 ++++++++++++++++++++++
 packages/sysutils/i2c-tools/meta    | 36 +++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100755 packages/sysutils/i2c-tools/build
 create mode 100755 packages/sysutils/i2c-tools/install
 create mode 100644 packages/sysutils/i2c-tools/meta

diff --git a/packages/sysutils/i2c-tools/build b/packages/sysutils/i2c-tools/build
new file mode 100755
index 0000000000..2469835fca
--- /dev/null
+++ b/packages/sysutils/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" \
diff --git a/packages/sysutils/i2c-tools/install b/packages/sysutils/i2c-tools/install
new file mode 100755
index 0000000000..e9559d61ac
--- /dev/null
+++ b/packages/sysutils/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/
diff --git a/packages/sysutils/i2c-tools/meta b/packages/sysutils/i2c-tools/meta
new file mode 100644
index 0000000000..f0e780b64b
--- /dev/null
+++ b/packages/sysutils/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"

From 9912f0635ebb8ba976c3867bb851f1798529216d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:12:19 +0100
Subject: [PATCH 07/16] dmidecode: move to debug tools

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/{sysutils => debug}/dmidecode/build   | 0
 packages/{sysutils => debug}/dmidecode/install | 0
 packages/{sysutils => debug}/dmidecode/meta    | 0
 packages/debug/meta                            | 2 +-
 projects/ATV/options                           | 3 ---
 scripts/image                                  | 3 ---
 6 files changed, 1 insertion(+), 7 deletions(-)
 rename packages/{sysutils => debug}/dmidecode/build (100%)
 rename packages/{sysutils => debug}/dmidecode/install (100%)
 rename packages/{sysutils => debug}/dmidecode/meta (100%)

diff --git a/packages/sysutils/dmidecode/build b/packages/debug/dmidecode/build
similarity index 100%
rename from packages/sysutils/dmidecode/build
rename to packages/debug/dmidecode/build
diff --git a/packages/sysutils/dmidecode/install b/packages/debug/dmidecode/install
similarity index 100%
rename from packages/sysutils/dmidecode/install
rename to packages/debug/dmidecode/install
diff --git a/packages/sysutils/dmidecode/meta b/packages/debug/dmidecode/meta
similarity index 100%
rename from packages/sysutils/dmidecode/meta
rename to packages/debug/dmidecode/meta
diff --git a/packages/debug/meta b/packages/debug/meta
index f3b70eef15..1415d6fb10 100644
--- a/packages/debug/meta
+++ b/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="strace gdb dmidecode"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
diff --git a/projects/ATV/options b/projects/ATV/options
index c8748d5b22..5432431588 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -309,9 +309,6 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
-# build with dmidecode support (yes / no)
-  DMIDECODE_SUPPORT="yes"
-
 # build with swap support (yes / no)
   SWAP_SUPPORT="yes"
 
diff --git a/scripts/image b/scripts/image
index ed70c69dce..dd46401e7a 100755
--- a/scripts/image
+++ b/scripts/image
@@ -135,9 +135,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 # Sensors support
   [ "$SENSOR_SUPPORT" = "yes" ] && $SCRIPTS/install lm_sensors
 
-# dmidecode support
-  [ "$DMIDECODE_SUPPORT" = "yes" ] && $SCRIPTS/install dmidecode
-
 # Update support
   [ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate
 

From 3490780d1d8ecc07c16c084aa30cb55ab68b714c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:13:44 +0100
Subject: [PATCH 08/16] i2c-tools: move to debug tools

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/{sysutils => debug}/i2c-tools/build   | 0
 packages/{sysutils => debug}/i2c-tools/install | 0
 packages/{sysutils => debug}/i2c-tools/meta    | 0
 packages/debug/meta                            | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/{sysutils => debug}/i2c-tools/build (100%)
 rename packages/{sysutils => debug}/i2c-tools/install (100%)
 rename packages/{sysutils => debug}/i2c-tools/meta (100%)

diff --git a/packages/sysutils/i2c-tools/build b/packages/debug/i2c-tools/build
similarity index 100%
rename from packages/sysutils/i2c-tools/build
rename to packages/debug/i2c-tools/build
diff --git a/packages/sysutils/i2c-tools/install b/packages/debug/i2c-tools/install
similarity index 100%
rename from packages/sysutils/i2c-tools/install
rename to packages/debug/i2c-tools/install
diff --git a/packages/sysutils/i2c-tools/meta b/packages/debug/i2c-tools/meta
similarity index 100%
rename from packages/sysutils/i2c-tools/meta
rename to packages/debug/i2c-tools/meta
diff --git a/packages/debug/meta b/packages/debug/meta
index 1415d6fb10..7a5045691c 100644
--- a/packages/debug/meta
+++ b/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 dmidecode"
+PKG_DEPENDS="strace gdb dmidecode i2c-tools"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

From 1daaba248f2dd5b26d6ab85b91b655846745daa0 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:15:24 +0100
Subject: [PATCH 09/16] acpica: move to debug tools

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/{sysutils => debug}/acpica/build   | 0
 packages/{sysutils => debug}/acpica/install | 0
 packages/{sysutils => debug}/acpica/meta    | 0
 packages/debug/meta                         | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/{sysutils => debug}/acpica/build (100%)
 rename packages/{sysutils => debug}/acpica/install (100%)
 rename packages/{sysutils => debug}/acpica/meta (100%)

diff --git a/packages/sysutils/acpica/build b/packages/debug/acpica/build
similarity index 100%
rename from packages/sysutils/acpica/build
rename to packages/debug/acpica/build
diff --git a/packages/sysutils/acpica/install b/packages/debug/acpica/install
similarity index 100%
rename from packages/sysutils/acpica/install
rename to packages/debug/acpica/install
diff --git a/packages/sysutils/acpica/meta b/packages/debug/acpica/meta
similarity index 100%
rename from packages/sysutils/acpica/meta
rename to packages/debug/acpica/meta
diff --git a/packages/debug/meta b/packages/debug/meta
index 7a5045691c..ab50261315 100644
--- a/packages/debug/meta
+++ b/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 dmidecode i2c-tools"
+PKG_DEPENDS="acpica strace gdb dmidecode i2c-tools"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

From f2a987ab77e45439b287bef520496452389ae8fb Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:16:29 +0100
Subject: [PATCH 10/16] pmtools: move to debug tools

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/debug/meta                          | 2 +-
 packages/{sysutils => debug}/pmtools/build   | 0
 packages/{sysutils => debug}/pmtools/install | 0
 packages/{sysutils => debug}/pmtools/meta    | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/{sysutils => debug}/pmtools/build (100%)
 rename packages/{sysutils => debug}/pmtools/install (100%)
 rename packages/{sysutils => debug}/pmtools/meta (100%)

diff --git a/packages/debug/meta b/packages/debug/meta
index ab50261315..84414e6177 100644
--- a/packages/debug/meta
+++ b/packages/debug/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="acpica strace gdb dmidecode i2c-tools"
+PKG_DEPENDS="acpica strace gdb dmidecode i2c-tools pmtools"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
diff --git a/packages/sysutils/pmtools/build b/packages/debug/pmtools/build
similarity index 100%
rename from packages/sysutils/pmtools/build
rename to packages/debug/pmtools/build
diff --git a/packages/sysutils/pmtools/install b/packages/debug/pmtools/install
similarity index 100%
rename from packages/sysutils/pmtools/install
rename to packages/debug/pmtools/install
diff --git a/packages/sysutils/pmtools/meta b/packages/debug/pmtools/meta
similarity index 100%
rename from packages/sysutils/pmtools/meta
rename to packages/debug/pmtools/meta

From 460e578997698d1d76d0d8280c9d57ec0cefe8a4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:29:53 +0100
Subject: [PATCH 11/16] acpica: add 64bit support, prevent install for ARM

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/debug/acpica/build   | 5 ++++-
 packages/debug/acpica/install | 5 ++++-
 packages/debug/acpica/meta    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/debug/acpica/build b/packages/debug/acpica/build
index 03721d7a32..ccd0723ccd 100755
--- a/packages/debug/acpica/build
+++ b/packages/debug/acpica/build
@@ -22,10 +22,13 @@
 
 . 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="32" \
+     BITS=$ACPICA_BITS \
      YACC=$ROOT/$TOOLCHAIN/bin/bison
      CWARNINGFLAGS="-O2 $TARGET_CFLAGS" \
diff --git a/packages/debug/acpica/install b/packages/debug/acpica/install
index 95d2fd4e36..827676fbd9 100755
--- a/packages/debug/acpica/install
+++ b/packages/debug/acpica/install
@@ -22,5 +22,8 @@
 
 . 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/bin32/* $INSTALL/usr/bin/
+  cp $PKG_BUILD/generate/unix/$ACPICA_BIN/* $INSTALL/usr/bin/
diff --git a/packages/debug/acpica/meta b/packages/debug/acpica/meta
index 4086abf04d..f294094e9a 100644
--- a/packages/debug/acpica/meta
+++ b/packages/debug/acpica/meta
@@ -21,7 +21,7 @@
 PKG_NAME="acpica-unix2"
 PKG_VERSION="20130117"
 PKG_REV="1"
-PKG_ARCH="any"
+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"

From 98a19be4c75d8342b413cd6ea4e22ee455250fd4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:35:21 +0100
Subject: [PATCH 12/16] dmidecode: prevent install for ARM

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/debug/dmidecode/install | 2 +-
 packages/debug/dmidecode/meta    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/debug/dmidecode/install b/packages/debug/dmidecode/install
index 943dbb7dcc..7302a5b8c2 100755
--- a/packages/debug/dmidecode/install
+++ b/packages/debug/dmidecode/install
@@ -23,4 +23,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/bin/
-cp $PKG_BUILD/{biosdecode,dmidecode,ownership,vpddecode} $INSTALL/usr/bin/
+  cp $PKG_BUILD/{biosdecode,dmidecode,ownership,vpddecode} $INSTALL/usr/bin/
diff --git a/packages/debug/dmidecode/meta b/packages/debug/dmidecode/meta
index 2d90c38cb1..f231370af1 100644
--- a/packages/debug/dmidecode/meta
+++ b/packages/debug/dmidecode/meta
@@ -21,7 +21,7 @@
 PKG_NAME="dmidecode"
 PKG_VERSION="2.11"
 PKG_REV="1"
-PKG_ARCH="any"
+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"

From ad9106620135a8d38c03cec2bff5c282d176a068 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:36:15 +0100
Subject: [PATCH 13/16] i2c-tools: cosmetics

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/debug/i2c-tools/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/debug/i2c-tools/install b/packages/debug/i2c-tools/install
index e9559d61ac..e8235dd6bc 100755
--- a/packages/debug/i2c-tools/install
+++ b/packages/debug/i2c-tools/install
@@ -23,5 +23,5 @@
 . 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/
+  cp $PKG_BUILD/tools/{i2cdetect,i2cdump,i2cget,i2cset} $INSTALL/usr/bin/
+  cp $PKG_BUILD/stub/i2c-stub-from-dump $INSTALL/usr/bin/

From 06d902745dcd24f393e6ceb5114bd3e79c102e65 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 00:38:13 +0100
Subject: [PATCH 14/16] pmtools: prevent install for ARM

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/debug/pmtools/install | 6 +++---
 packages/debug/pmtools/meta    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/debug/pmtools/install b/packages/debug/pmtools/install
index 403b128126..382020d6e3 100755
--- a/packages/debug/pmtools/install
+++ b/packages/debug/pmtools/install
@@ -23,6 +23,6 @@
 . 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/
+  cp $PKG_BUILD/acpidump/acpidump $INSTALL/usr/bin/
+  cp $PKG_BUILD/acpixtract/acpixtract $INSTALL/usr/bin/
+  cp $PKG_BUILD/madt/madt $INSTALL/usr/bin/
diff --git a/packages/debug/pmtools/meta b/packages/debug/pmtools/meta
index 6e7bc25a7b..0631939995 100644
--- a/packages/debug/pmtools/meta
+++ b/packages/debug/pmtools/meta
@@ -21,10 +21,10 @@
 PKG_NAME="pmtools"
 PKG_VERSION="20071116"
 PKG_REV="1"
-PKG_ARCH="any"
+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/pmtools-20071116.tar.gz"
+PKG_URL="https://lesswatts.org/patches/linux_acpi/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

From c691a33edd1441cb2843752a8c4f6c21c2188616 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 01:43:40 +0100
Subject: [PATCH 15/16] eventlircd, add more cypress remotes, this fixes #1347

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../eventlircd/evmap/{03_04b4_0101.evmap => cypress.evmap}  | 0
 .../sysutils/remote/eventlircd/udev.d/98-eventlircd.rules   | 6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename packages/sysutils/remote/eventlircd/evmap/{03_04b4_0101.evmap => cypress.evmap} (100%)

diff --git a/packages/sysutils/remote/eventlircd/evmap/03_04b4_0101.evmap b/packages/sysutils/remote/eventlircd/evmap/cypress.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/evmap/03_04b4_0101.evmap
rename to packages/sysutils/remote/eventlircd/evmap/cypress.evmap
diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
index 8d401b350a..04a232d878 100644
--- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
+++ b/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", \

From 6f03b497c309f45bb007a8da502edfb66dbefe5d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Feb 2013 02:18:47 +0100
Subject: [PATCH 16/16] xbmc: add watchdog support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../xbmc/patches/xbmc-801-watchdog.patch      | 171 ++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 packages/mediacenter/xbmc/patches/xbmc-801-watchdog.patch

diff --git a/packages/mediacenter/xbmc/patches/xbmc-801-watchdog.patch b/packages/mediacenter/xbmc/patches/xbmc-801-watchdog.patch
new file mode 100644
index 0000000000..f563d6691b
--- /dev/null
+++ b/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);