diff options
Diffstat (limited to 'meta/packages/dbus')
-rw-r--r-- | meta/packages/dbus/dbus-1.2.24/99_dbus | 1 | ||||
-rw-r--r-- | meta/packages/dbus/dbus.inc | 10 | ||||
-rw-r--r-- | meta/packages/dbus/dbus_1.2.24.bb | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/meta/packages/dbus/dbus-1.2.24/99_dbus b/meta/packages/dbus/dbus-1.2.24/99_dbus deleted file mode 100644 index 6821ae4dba..0000000000 --- a/meta/packages/dbus/dbus-1.2.24/99_dbus +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | d messagebus messagebus 0755 /var/run/dbus none | ||
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc index a085287fc4..90a38e66a9 100644 --- a/meta/packages/dbus/dbus.inc +++ b/meta/packages/dbus/dbus.inc | |||
@@ -9,8 +9,7 @@ DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm" | |||
9 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | 9 | SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ |
10 | file://tmpdir.patch; \ | 10 | file://tmpdir.patch; \ |
11 | file://fix-install-daemon.patch; \ | 11 | file://fix-install-daemon.patch; \ |
12 | file://dbus-1.init \ | 12 | file://dbus-1.init" |
13 | file://99_dbus" | ||
14 | 13 | ||
15 | inherit autotools pkgconfig gettext update-rc.d | 14 | inherit autotools pkgconfig gettext update-rc.d |
16 | 15 | ||
@@ -54,6 +53,10 @@ pkg_postinst_dbus() { | |||
54 | 53 | ||
55 | grep -q netdev: /etc/group || addgroup netdev | 54 | grep -q netdev: /etc/group || addgroup netdev |
56 | chmod u+s /usr/libexec/dbus-daemon-launch-helper | 55 | chmod u+s /usr/libexec/dbus-daemon-launch-helper |
56 | |||
57 | # add volatile after new user/grp are created | ||
58 | echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus | ||
59 | /etc/init.d/populate-volatile.sh update | ||
57 | } | 60 | } |
58 | 61 | ||
59 | EXTRA_OECONF_X = "--with-x" | 62 | EXTRA_OECONF_X = "--with-x" |
@@ -70,9 +73,6 @@ EXTRA_OECONF = "--disable-tests \ | |||
70 | do_install() { | 73 | do_install() { |
71 | autotools_do_install | 74 | autotools_do_install |
72 | 75 | ||
73 | install -d ${D}/etc/default/volatiles | ||
74 | install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/ | ||
75 | |||
76 | install -d ${D}${sysconfdir}/init.d | 76 | install -d ${D}${sysconfdir}/init.d |
77 | install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 | 77 | install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 |
78 | } | 78 | } |
diff --git a/meta/packages/dbus/dbus_1.2.24.bb b/meta/packages/dbus/dbus_1.2.24.bb index f331b140aa..8e3e329fde 100644 --- a/meta/packages/dbus/dbus_1.2.24.bb +++ b/meta/packages/dbus/dbus_1.2.24.bb | |||
@@ -1,3 +1,3 @@ | |||
1 | include dbus.inc | 1 | include dbus.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |