diff options
| author | Justin Patrin <papercrane@gmail.com> | 2007-01-21 20:35:02 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2007-01-21 20:35:02 +0000 |
| commit | 725b31633b9944eec4c081f1edad620607ce5c5d (patch) | |
| tree | ceb8c4ecb940ba86bb136862dcf0d5f609a0f2df /packages/hal | |
| parent | a01f1ba3c4046a1beb395acf21008864b1880156 (diff) | |
| parent | 4e9277d080e363f4eaa16a0d345c23970a65c4e5 (diff) | |
merge of '98112dc48d05ba36117d1045ed0b25ac449d5c7f'
and 'a6d3725bcd7849f3044d01c9bfa2c73dd96dfe89'
Diffstat (limited to 'packages/hal')
| -rw-r--r-- | packages/hal/files/99_hal | 1 | ||||
| -rw-r--r-- | packages/hal/hal_0.5.8.1.bb | 36 |
2 files changed, 34 insertions, 3 deletions
diff --git a/packages/hal/files/99_hal b/packages/hal/files/99_hal new file mode 100644 index 0000000000..f3d477231e --- /dev/null +++ b/packages/hal/files/99_hal @@ -0,0 +1 @@ +d root root 0700 /var/run/hald none diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb index 4b2196f875..f608c4018c 100644 --- a/packages/hal/hal_0.5.8.1.bb +++ b/packages/hal/hal_0.5.8.1.bb @@ -3,14 +3,15 @@ HOMEPAGE = "http://freedesktop.org/Software/hal" SECTION = "unknown" LICENSE = "GPL LGPL AFL" -DEPENDS = "dbus-glib expat libusb" +DEPENDS = "dbus-glib udev intltool expat libusb" RDEPENDS += "udev" #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}/hwdata \ --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 = " \ |