From b78333c8159b614e19d51e99f4d881377c7e23e4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 10 Jun 2010 22:25:00 +0200
Subject: [PATCH] xbmc: - move installation of udisks, upower, ConsoleKit,
 remote, lcdproc, lm_sensors, autoupdate out to packages/image

---
 packages/image/install            | 19 +++++++++++++++++++
 packages/mediacenter/xbmc/install |  7 -------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/image/install b/packages/image/install
index 71e1759e44..1301de3ea2 100755
--- a/packages/image/install
+++ b/packages/image/install
@@ -73,6 +73,25 @@ case "$2" in
 # Multimedia support
     [ ! "$MEDIACENTER" = no ] && $SCRIPTS/install mediacenter
 
+# Automounter support
+    [ "$UDISKS" = yes ] && $SCRIPTS/install udisks
+
+# Powermanagement support
+    [ "$UPOWER" = yes ] && $SCRIPTS/install upower
+    [ "$UPOWER" = yes ] && $SCRIPTS/install ConsoleKit
+
+# Remote support
+    [ "$REMOTE_SUPPORT" = yes ] && $SCRIPTS/install remote
+
+# LCD support
+    [ ! "$LCD_DRIVER" = none ] && $SCRIPTS/install lcdproc
+
+# Sensors support
+    [ "$SENSOR_SUPPORT" = yes ] && $SCRIPTS/install lm_sensors
+
+# Update support
+    [ "$UPDATE_SUPPORT" = yes ] && $SCRIPTS/install autoupdate
+
 # Games support
     [ "$GAMES" = yes ] && $SCRIPTS/install games
     [ "$EMULATORS" = yes ] && $SCRIPTS/install emulators
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 4f8007d26e..40923c8fff 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -60,9 +60,6 @@ $SCRIPTS/install samba
 [ "$CRYSTALHD" = yes ] && $SCRIPTS/install crystalhd
 [ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi
 [ "$WEBSERVER" = yes ] && $SCRIPTS/install libmicrohttpd
-[ "$UDISKS" = yes ] && $SCRIPTS/install udisks
-[ "$UPOWER" = yes ] && $SCRIPTS/install upower
-[ "$UPOWER" = yes ] && $SCRIPTS/install ConsoleKit
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`"
@@ -103,7 +100,3 @@ fi
 
 # other programs needed to run
   $SCRIPTS/install alsa
-  [ "$REMOTE_SUPPORT" = yes ] && $SCRIPTS/install remote
-  [ ! "$LCD_DRIVER" = none ] && $SCRIPTS/install lcdproc
-  [ "$SENSOR_SUPPORT" = yes ] && $SCRIPTS/install lm_sensors
-  [ "$UPDATE_SUPPORT" = yes ] && $SCRIPTS/install autoupdate