summaryrefslogtreecommitdiffstats
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 16:52:00 +0100
commit8dc48993f33a3f656a8f980f5c0c048b47bce9cf (patch)
tree706e91cfeba376eff72e3198882e1eb3760fe1e8
parent2458da25a83df9dc8d849ccf3de7f80fb194a33a (diff)
downloadpoky-8dc48993f33a3f656a8f980f5c0c048b47bce9cf.tar.gz
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. (From OE-Core rev: aebb9d6599aac683456adf56dc11f8b9f10f25c3) 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 1ef0d8fcfd..acf43d53ee 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
21 21
22DEBIANNAME_${PN} = "dbus-1" 22DEBIANNAME_${PN} = "dbus-1"
23 23
24PACKAGES =+ "${PN}-lib" 24PACKAGES =+ "${PN}-lib ${PN}-x11"
25
26FILES_${PN}-x11 = "${bindir}/dbus-launch"
25 27
26FILES_${PN} = "${bindir}/dbus-daemon* \ 28FILES_${PN} = "${bindir}/dbus-daemon* \
27 ${bindir}/dbus-uuidgen \ 29 ${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 f16d9f2904..d1c59dcab1 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 = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" 5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd" 6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"