[PATCH 1/3] dbus: split X11 dependant dbus-launch into its own subpackage

[PATCH 1/3] dbus: split X11 dependant dbus-launch into its own subpackage

[Koen Kooi]

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>
---
 meta/recipes-core/dbus/dbus.inc      |    4 +++-
 meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 1ef0d8f..acf43d5 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 f16d9f2..d1c59dc 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"
-- 
1.6.6.1

[PATCH 2/3] qemu-config: add runtime dep on dbus-x11

[Koen Kooi]

dbus-launch moved into the dbus-x11 packages, so we need to drag it in.

Also reorder fields to better fit with the styleguide

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-bsp/qemu-config/qemu-config.bb |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index e74f2da..f91875e 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -3,8 +3,9 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
-RDEPENDS_${PN} = "distcc task-core-nfs-server oprofileui-server rsync bash"
-PR = "r19"
+COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
+
+PR = "r20"
 
 SRC_URI = "file://distcc.sh \
            file://anjuta-remote-run \
@@ -15,9 +16,6 @@ SRC_URI = "file://distcc.sh \
 
 S = "${WORKDIR}"
 
-COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
-PACKAGE_ARCH = "all"
-
 do_install() {
     install -d ${D}${sysconfdir}/profile.d
 
@@ -34,6 +32,9 @@ do_install() {
     install qemu-autostart ${D}/etc/init.d/
 }
 
+RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
+PACKAGE_ARCH = "all"
+
 inherit update-rc.d
 
 INITSCRIPT_NAME = "qemu-autostart"
-- 
1.6.6.1

[PATCH 3/3] x11-common 0.1: add runtime dep on dbus-x11

[Koen Kooi]

dbus-launch moved into the dbus-x11 packages, so we need to drag it in.

Also reorder fields to better fit with the styleguide

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/x11-common/x11-common_0.1.bb |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 2d49951..10757ac 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,19 +2,20 @@ DESCRIPTION = "Common X11 scripts and configuration files"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
-PR = "r40"
+PR = "r41"
 
 SRC_URI = "file://etc \
            file://gplv2-license.patch"
 
 S = ${WORKDIR}
 
-PACKAGE_ARCH = "all"
-
 do_install() {
 	cp -R ${S}/etc ${D}/etc
 	chmod -R 755 ${D}/etc
 	find ${D}/etc -type d -name .svn -prune -exec rm -rf {} \;
 	find ${D}/etc -type f -name \*~ -exec rm -rf {} \;
 }
+
+RDEPENDS_${PN} = "dbus-launch xmodmap xdpyinfo xtscal xinit formfactor"
+PACKAGE_ARCH = "all"
+
-- 
1.6.6.1

Re: [PATCH 1/3] dbus: split X11 dependant dbus-launch into its own subpackage

[Richard Purdie]

On Thu, 2011-05-26 at 11:00 +0200, Koen Kooi wrote:
> 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.

Merged to master, thanks (along with patches 2 and 3)

Cheers,

Richard