summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-26 11:09:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-26 16:52:00 +0100
commit5168b140183c569409d35b19d8a80265ef8d0a78 (patch)
tree90bf4e512ec4cc381ee2d7de1628ecaf83a1482a
parentda1a404540627267d2f3db1246b0097723b13b59 (diff)
downloadpoky-5168b140183c569409d35b19d8a80265ef8d0a78.tar.gz
dbus 1.4.1: enable systemd support, but package systemd files seperately
Systemd support in dbus only affects 'make install', so no changes for sysvinit based systems (From OE-Core rev: 9281ac4c98d4287a5492f13f94e1bd0eea4791c6) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus.inc5
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.1.bb2
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index acf43d53ee..8275a1be71 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -21,10 +21,12 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
21 21
22DEBIANNAME_${PN} = "dbus-1" 22DEBIANNAME_${PN} = "dbus-1"
23 23
24PACKAGES =+ "${PN}-lib ${PN}-x11" 24PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd"
25 25
26FILES_${PN}-x11 = "${bindir}/dbus-launch" 26FILES_${PN}-x11 = "${bindir}/dbus-launch"
27 27
28FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
29
28FILES_${PN} = "${bindir}/dbus-daemon* \ 30FILES_${PN} = "${bindir}/dbus-daemon* \
29 ${bindir}/dbus-uuidgen \ 31 ${bindir}/dbus-uuidgen \
30 ${bindir}/dbus-launch \ 32 ${bindir}/dbus-launch \
@@ -73,6 +75,7 @@ EXTRA_OECONF = "--disable-tests \
73 --disable-doxygen-docs \ 75 --disable-doxygen-docs \
74 --disable-libaudit \ 76 --disable-libaudit \
75 --with-xml=expat \ 77 --with-xml=expat \
78 --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
76 ${EXTRA_OECONF_X}" 79 ${EXTRA_OECONF_X}"
77 80
78do_install() { 81do_install() {
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index d1c59dcab1..00720fd88f 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 = "r2" 3PR = "r3"
4 4
5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" 5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd" 6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"