From 53e080efc55e401219e3eca9bb98ec8bc083abda Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 7 May 2010 04:00:51 +0200 Subject: [PATCH] hal: - remove init.d script - strip down installation of hal, we actually only need the libs for building xbmc --- packages/sysutils/hal/init.d/13_hal | 12 ----- packages/sysutils/hal/install | 53 ------------------- .../hal-Linux-should-use-evdev-xkb-rule.diff | 26 --------- 3 files changed, 91 deletions(-) delete mode 100755 packages/sysutils/hal/init.d/13_hal delete mode 100644 packages/sysutils/hal/patches/hal-Linux-should-use-evdev-xkb-rule.diff diff --git a/packages/sysutils/hal/init.d/13_hal b/packages/sysutils/hal/init.d/13_hal deleted file mode 100755 index 2fea190991..0000000000 --- a/packages/sysutils/hal/init.d/13_hal +++ /dev/null @@ -1,12 +0,0 @@ -# -# starting HAL -# -# runlevels: openelec, textmode - -progress "Starting Hardware Abstraction Layer" - - $IONICE mkdir -p /var/cache/hald \ - /var/run/dbus/hald-local \ - /var/run/dbus/hald-runner - - hald --verbose=no --daemon=yes --use-syslog & diff --git a/packages/sysutils/hal/install b/packages/sysutils/hal/install index ad17e14996..37152c3c88 100755 --- a/packages/sysutils/hal/install +++ b/packages/sysutils/hal/install @@ -9,60 +9,7 @@ $SCRIPTS/install dbus $SCRIPTS/install dbus-glib $SCRIPTS/install util-linux-ng -add_user haldaemon x 68 68 "HAL daemon" "/" "/bin/sh" -add_group haldaemon 68 - -mkdir -p $INSTALL/usr/sbin - cp $PKG_BUILD/hald/hald $INSTALL/usr/sbin/ - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/lshal $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-device $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-disable-polling $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-find-by-capability $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-find-by-property $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-get-property $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-is-caller-locked-out $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-lock $INSTALL/usr/bin - cp $PKG_BUILD/tools/.libs/hal-set-property $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/libexec - cp $PKG_BUILD/tools/.libs/hal-storage-mount $INSTALL/usr/libexec - cp $PKG_BUILD/tools/.libs/hal-storage-unmount $INSTALL/usr/libexec - cp $PKG_BUILD/tools/.libs/hal-storage-eject $INSTALL/usr/libexec - cp $PKG_BUILD/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec - cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec - cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-all-mountpoints $INSTALL/usr/libexec - cp $PKG_BUILD/hald/linux/addons/.libs/hald-addon-* $INSTALL/usr/libexec - cp $PKG_BUILD/hald/linux/probing/.libs/hald-probe-* $INSTALL/usr/libexec - cp $PKG_BUILD/hald/hald-generate-fdi-cache $INSTALL/usr/libexec - cp $PKG_BUILD/hald-runner/hald-runner $INSTALL/usr/libexec - -mkdir -p $INSTALL/usr/lib/hal/scripts - cp $PKG_BUILD/tools/hal-functions $INSTALL/usr/lib/hal/scripts - cp $PKG_BUILD/tools/hal-dockstation-undock $INSTALL/usr/lib/hal/scripts - mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/libhal/.libs/libhal.so* $INSTALL/usr/lib cp -PR $PKG_BUILD/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libhal-storage.so*T - -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/lib/udev/rules.d - -mkdir -p $INSTALL/etc/dbus-1/system.d - cp $PKG_BUILD/hal.conf $INSTALL/etc/dbus-1/system.d - -mkdir -p $INSTALL/etc/hal/fdi/preprobe -mkdir -p $INSTALL/etc/hal/fdi/information -mkdir -p $INSTALL/etc/hal/fdi/policy -mkdir -p $INSTALL/usr/share/hal/fdi/preprobe -mkdir -p $INSTALL/usr/share/hal/fdi/information/10freedesktop - -mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor -cp \ - $PKG_BUILD/fdi/policy/10osvendor/10-input-policy.fdi \ - $PKG_BUILD/fdi/policy/10osvendor/10-keymap.fdi \ - $PKG_BUILD/fdi/policy/10osvendor/20-storage-methods.fdi \ - $PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \ - $INSTALL/usr/share/hal/fdi/policy/10osvendor diff --git a/packages/sysutils/hal/patches/hal-Linux-should-use-evdev-xkb-rule.diff b/packages/sysutils/hal/patches/hal-Linux-should-use-evdev-xkb-rule.diff deleted file mode 100644 index 8893286468..0000000000 --- a/packages/sysutils/hal/patches/hal-Linux-should-use-evdev-xkb-rule.diff +++ /dev/null @@ -1,26 +0,0 @@ -From a81c0756c48621fadd18597bb337e08c4c3529d0 Mon Sep 17 00:00:00 2001 -From: Yan Li -Date: Mon, 5 Jan 2009 17:16:03 +0800 -Subject: [PATCH] Linux should use evdev xkb rule - - -Signed-off-by: Yan Li ---- - fdi/policy/10osvendor/10-keymap.fdi | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-keymap.fdi b/fdi/policy/10osvendor/10-keymap.fdi -index c9ad87c..1971e8b 100644 ---- a/fdi/policy/10osvendor/10-keymap.fdi -+++ b/fdi/policy/10osvendor/10-keymap.fdi -@@ -13,6 +13,7 @@ - keyboard - -+ evdev - evdev - - --- -1.5.6.5 -