diff options
Diffstat (limited to 'meta/packages/hal/hal.inc')
-rw-r--r-- | meta/packages/hal/hal.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc index 29ceadcfa6..839dfd0652 100644 --- a/meta/packages/hal/hal.inc +++ b/meta/packages/hal/hal.inc | |||
@@ -10,7 +10,6 @@ DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native exp | |||
10 | RDEPENDS += "udev hal-info" | 10 | RDEPENDS += "udev hal-info" |
11 | 11 | ||
12 | SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ | 12 | SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ |
13 | file://99_hal \ | ||
14 | file://20hal" | 13 | file://20hal" |
15 | 14 | ||
16 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
@@ -37,8 +36,6 @@ PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', ' | |||
37 | PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}" | 36 | PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}" |
38 | 37 | ||
39 | do_install_append() { | 38 | do_install_append() { |
40 | install -d ${D}/etc/default/volatiles | ||
41 | install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles | ||
42 | install -d ${D}/etc/dbus-1/event.d | 39 | install -d ${D}/etc/dbus-1/event.d |
43 | install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d | 40 | install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d |
44 | } | 41 | } |
@@ -53,6 +50,9 @@ pkg_postinst_hal () { | |||
53 | grep haldaemon /etc/group || addgroup haldaemon | 50 | grep haldaemon /etc/group || addgroup haldaemon |
54 | grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL | 51 | grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL |
55 | 52 | ||
53 | # add volatile after new user/grp are created | ||
54 | echo "d root root 0700 /var/run/hald none" > /etc/default/volatiles/99_hal | ||
55 | echo "d haldaemon haldaemon 0755 /var/cache/hald none" >> /etc/default/volatiles/99_hal | ||
56 | /etc/init.d/populate-volatile.sh update | 56 | /etc/init.d/populate-volatile.sh update |
57 | 57 | ||
58 | DBUSPID=`pidof dbus-daemon` | 58 | DBUSPID=`pidof dbus-daemon` |