[oe-commits] org.oe.dev Hal: merge improvements from poky, remove stale versions

[koen commit]

Hal: merge improvements from poky, remove stale versions

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: df1e6ea05079b47e31ada4370ced6c05fc4dea6a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df1e6ea05079b47e31ada4370ced6c05fc4dea6a
Files:
1
packages/hal/hal_0.2.98.bb
packages/hal/hal_0.5.2.bb
packages/hal/hal_0.5.4.bb
packages/hal/hal_0.5.7.bb
packages/hal/hal_0.5.8.1.bb
packages/hal/files/20hal
packages/hal/files/99_hal
packages/hal/hal_0.5.9.bb
Diffs:

#
# mt diff -r7954d4275dc1865e011407126cfd455d897e754d -rdf1e6ea05079b47e31ada4370ced6c05fc4dea6a
#
# 
# 
# delete "packages/hal/hal_0.2.98.bb"
# 
# delete "packages/hal/hal_0.5.2.bb"
# 
# delete "packages/hal/hal_0.5.4.bb"
# 
# delete "packages/hal/hal_0.5.7.bb"
# 
# delete "packages/hal/hal_0.5.8.1.bb"
# 
# add_file "packages/hal/files/20hal"
#  content [b5274aeb2afa6b68caa3f9d7883f7b050c1b2df5]
# 
# patch "packages/hal/files/99_hal"
#  from [e88c6d3d65c6b9fd39178ee7fdbff1b3c031da5b]
#    to [a3df6825819f92ff438eb0d5821b6f164630493b]
# 
# patch "packages/hal/hal_0.5.9.bb"
#  from [fc2d3dcfbeabfcdd86ee611a5b862c891ba01a58]
#    to [212571a9152068eeb0f89ea9731dbf0378ecd1b0]
# 
============================================================
--- packages/hal/files/20hal	b5274aeb2afa6b68caa3f9d7883f7b050c1b2df5
+++ packages/hal/files/20hal	b5274aeb2afa6b68caa3f9d7883f7b050c1b2df5
@@ -0,0 +1,58 @@
+#! /bin/sh
+#
+# hal		Start the Daemon that stores device informations
+#		for the Hardware abstraction layer
+#
+#		Written by Martin Waitz based on skeleton code
+#		written by Miquel van Smoorenburg <miquels at cistron.nl>.
+#		Modified for Debian 
+#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/hald
+PIDDIR=/var/run/hald
+PIDFILE=$PIDDIR/hald.pid
+NAME=hald
+DAEMONUSER=haldaemon
+DESC="Hardware abstraction layer"
+
+test -x $DAEMON || exit 0
+
+set -e
+
+do_start() {
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER:$DAEMONUSER $PIDDIR
+  fi
+	echo "Starting $DESC" "$NAME"
+	start-stop-daemon --start --pidfile $PIDFILE \
+		--exec $DAEMON -- $DAEMON_OPTS
+}
+
+do_stop() {
+	echo "Stopping $DESC" "$NAME"
+	start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \
+		--exec $DAEMON 
+}
+
+case "$1" in
+  start)
+    do_start
+	;;
+  stop)
+    do_stop
+	;;
+  restart|force-reload)
+  do_stop
+	sleep 5
+  do_start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
============================================================
--- packages/hal/files/99_hal	e88c6d3d65c6b9fd39178ee7fdbff1b3c031da5b
+++ packages/hal/files/99_hal	a3df6825819f92ff438eb0d5821b6f164630493b
@@ -1,2 +1,2 @@ d root root 0700 /var/run/hald none
 d root root 0700 /var/run/hald none
+d haldaemon haldaemon 0755 /var/cache/hald none
-d root root 0700 /var/cache/hald none
============================================================
--- packages/hal/hal_0.5.9.bb	fc2d3dcfbeabfcdd86ee611a5b862c891ba01a58
+++ packages/hal/hal_0.5.9.bb	212571a9152068eeb0f89ea9731dbf0378ecd1b0
@@ -5,9 +5,11 @@ RRECOMMENDS = "udev-utils"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://99_hal"
+SRC_URI += "file://99_hal \
+            file://20hal \
+	   "
 
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
                 --with-expat=${STAGING_LIBDIR}/.. \
@@ -29,6 +31,8 @@ do_install_append() {
 do_install_append() {
 	install -d ${D}/etc/default/volatiles
 	install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
+        install -d ${D}/etc/dbus-1/event.d
+        install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
 }
 
 do_stage() {