summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-26 11:00:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-26 11:01:37 +0100
commitaebb9d6599aac683456adf56dc11f8b9f10f25c3 (patch)
tree962e5e7b80edab744aa58f13edbf7a81535f6f2b
parenta04d50a0318cd16d5fb02a625d739e03b94e42b7 (diff)
downloadopenembedded-core-aebb9d6599aac683456adf56dc11f8b9f10f25c3.tar.gz
openembedded-core-aebb9d6599aac683456adf56dc11f8b9f10f25c3.tar.bz2
openembedded-core-aebb9d6599aac683456adf56dc11f8b9f10f25c3.tar.xz
openembedded-core-aebb9d6599aac683456adf56dc11f8b9f10f25c3.zip
dbus: split X11 dependant dbus-launch into its own subpackage
This makes dbus usable in non-X enviroments like QT/e >From the original commit in OE .dev: commit 8e25448fb01b6fa6ea3a86f9327f080cd753dfbc Author: John Lee <john_lee@openmoko.org> Date: Fri Sep 5 11:37:39 2008 +0000 dbus: enable x support and put dbus-launch into new package dbus-x11 * Enable x support only add rdepends to dbus-launch. Make it a seperate package so other packages like dbus does not rdepend on libx11. 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.inc4
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.1.bb2
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 1ef0d8fcf..acf43d53e 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -21,7 +21,9 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
DEBIANNAME_${PN} = "dbus-1"
-PACKAGES =+ "${PN}-lib"
+PACKAGES =+ "${PN}-lib ${PN}-x11"
+
+FILES_${PN}-x11 = "${bindir}/dbus-launch"
FILES_${PN} = "${bindir}/dbus-daemon* \
${bindir}/dbus-uuidgen \
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index f16d9f290..d1c59dcab 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 = "r1"
+PR = "r2"
SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"