[oe-commits] org.oe.dev hal: merge in HAL bits from Poky

[koen commit]

hal: merge in HAL bits from Poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 991bdefc0c20378a74650c650530041b206d7c4c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=991bdefc0c20378a74650c650530041b206d7c4c
Files:
1
packages/hal/files/99_hal
packages/hal/hal_0.5.8.1.bb
Diffs:

#
# mt diff -rf8b5f42bbde403d6fcc1bb435fda5db091f84805 -r991bdefc0c20378a74650c650530041b206d7c4c
#
# 
# 
# add_file "packages/hal/files/99_hal"
#  content [55dfbb79c7de92577aae876bda269767dc02b3d8]
# 
# patch "packages/hal/hal_0.5.8.1.bb"
#  from [13266a6090e402210644e5719f46ca904e3b09fb]
#    to [12e720399ee8f864df21d469235b956a67f4d7f1]
# 
============================================================
--- packages/hal/files/99_hal	55dfbb79c7de92577aae876bda269767dc02b3d8
+++ packages/hal/files/99_hal	55dfbb79c7de92577aae876bda269767dc02b3d8
@@ -0,0 +1 @@
+d root root 0700 /var/run/hald none
============================================================
--- packages/hal/hal_0.5.8.1.bb	13266a6090e402210644e5719f46ca904e3b09fb
+++ packages/hal/hal_0.5.8.1.bb	12e720399ee8f864df21d469235b956a67f4d7f1
@@ -8,9 +8,10 @@ RRECOMMENDS = "udev-utils"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz"
+SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
+        file://99_hal"
 
 S = "${WORKDIR}/hal-${PV}"
 
@@ -24,6 +25,11 @@ EXTRA_OECONF = "--with-hwdata=${datadir}
                 --disable-policy-kit \
                 "
 
+do_install_append() {
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
+}
+
 do_stage() {
         autotools_stage_all
         install -d ${STAGING_LIBDIR}
@@ -31,6 +37,30 @@ do_stage() {
         install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so
 }
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+pkg_postinst_hal () {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+
+	/etc/init.d/populate-volatile.sh update
+
+	grep haldaemon /etc/group || addgroup haldaemon
+	grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
+}
+
+pkg_postrm_hal () {
+	deluser haldaemon || true
+	delgroup haldaemon || true
+}
+
 #PACKAGES += "hal-device-manager"
 
 #FILES_hal-device-manager = " \