summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-27 16:41:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-27 16:38:52 +0100
commit3faabbf1e87e47094cc8a8e5943242223e33d94c (patch)
tree4a491ec7661d9f70a46ae0da0ce944f80aae5e83 /meta
parentb8b479e76a5634212ab0e2cbd7c882267f2aebf6 (diff)
downloadpoky-3faabbf1e87e47094cc8a8e5943242223e33d94c.tar.gz
dbus 1.4.1: create UUIDDIR in postinst
This fixes dbus usage in non-sysV init systems. Volatiles aren't needed in systemd land, since /run is tmpfs and the dbus units take care of all this. (From OE-Core rev: 4c3490922c3bea5f9c9810bb40dc5f5d8783de5a) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/dbus/dbus.inc12
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.1.bb2
2 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a5f8bdb98..38acf354fb 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -49,13 +49,17 @@ pkg_postinst_dbus() {
49 49
50 MESSAGEUSER=messagebus 50 MESSAGEUSER=messagebus
51 MESSAGEHOME=/var/run/dbus 51 MESSAGEHOME=/var/run/dbus
52 UUIDDIR=/var/lib/dbus
52 53
53 mkdir -p $MESSAGEHOME || true 54 mkdir -p $MESSAGEHOME
55 mkdir -p $UUIDDIR
54 chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" 56 chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
55 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \ 57 chown "$MESSAGEUSER":"$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
56 adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \ 58 adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
57 --ingroup "$MESSAGEUSER" "$MESSAGEUSER" 59 --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
58 60
61 chown "$MESSAGEUSER":"$MESSAGEUSER" "$UUIDDIR"
62
59 grep -q netdev: /etc/group || addgroup netdev 63 grep -q netdev: /etc/group || addgroup netdev
60 64
61 chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper 65 chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper
@@ -63,7 +67,9 @@ pkg_postinst_dbus() {
63 67
64 # add volatile after new user/grp are created 68 # add volatile after new user/grp are created
65 echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus 69 echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
66 /etc/init.d/populate-volatile.sh update 70 if [ -e /etc/init.d/populate-volatile.sh ] ; then
71 /etc/init.d/populate-volatile.sh update
72 fi
67} 73}
68 74
69EXTRA_OECONF_X = "--with-x" 75EXTRA_OECONF_X = "--with-x"
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index 1c8aeaa5cc..f65ef35b90 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" 5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd" 6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"