aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus
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 11:02:30 +0100
commit9281ac4c98d4287a5492f13f94e1bd0eea4791c6 (patch)
tree505787b0b7b62c0b10feed2d5281f61f11b388de /meta/recipes-core/dbus
parent5457a4ddefac2262067172d0db5c7d646aacb5c0 (diff)
downloadopenembedded-core-contrib-9281ac4c98d4287a5492f13f94e1bd0eea4791c6.tar.gz
openembedded-core-contrib-9281ac4c98d4287a5492f13f94e1bd0eea4791c6.tar.bz2
openembedded-core-contrib-9281ac4c98d4287a5492f13f94e1bd0eea4791c6.zip
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 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus')
-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 acf43d53ee3..8275a1be713 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
DEBIANNAME_${PN} = "dbus-1"
-PACKAGES =+ "${PN}-lib ${PN}-x11"
+PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd"
FILES_${PN}-x11 = "${bindir}/dbus-launch"
+FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
+
FILES_${PN} = "${bindir}/dbus-daemon* \
${bindir}/dbus-uuidgen \
${bindir}/dbus-launch \
@@ -73,6 +75,7 @@ EXTRA_OECONF = "--disable-tests \
--disable-doxygen-docs \
--disable-libaudit \
--with-xml=expat \
+ --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
${EXTRA_OECONF_X}"
do_install() {
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index d1c59dcab17..00720fd88f2 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 @@
include dbus.inc
-PR = "r2"
+PR = "r3"
SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"