Patchwork dbus: split X11 dependant dbus-launch into its own subpackage

login
register
mail settings
Submitter Koen Kooi
Date May 25, 2011, 8:18 p.m.
Message ID <1306354721-16325-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/4773/
State New, archived
Headers show

Comments

Koen Kooi - May 25, 2011, 8:18 p.m.
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(-)
Richard Purdie - May 25, 2011, 9:43 p.m.
On Wed, 2011-05-25 at 22:18 +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.

Which pieces of the system use dbus-launch and do we need to add
dependencies to them after this change to pull in the dbus-x11 package?

Cheers,

Richard
Saul Wold - May 25, 2011, 9:49 p.m.
On 05/25/2011 02:43 PM, Richard Purdie wrote:
> On Wed, 2011-05-25 at 22:18 +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.
>
> Which pieces of the system use dbus-launch and do we need to add
> dependencies to them after this change to pull in the dbus-x11 package?
>
Richard there is a patch from Khem back on 5/7 that replaces gconf-dbus 
but did not have all the parts in place, I think this is the first steps 
to getting the parts in place to beable  to untangle the gconf dbus stuff

Sau!

> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - May 25, 2011, 10:43 p.m.
On Wed, 2011-05-25 at 14:49 -0700, Saul Wold wrote:
> On 05/25/2011 02:43 PM, Richard Purdie wrote:
> > On Wed, 2011-05-25 at 22:18 +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.
> >
> > Which pieces of the system use dbus-launch and do we need to add
> > dependencies to them after this change to pull in the dbus-x11 package?
> >
> Richard there is a patch from Khem back on 5/7 that replaces gconf-dbus 
> but did not have all the parts in place, I think this is the first steps 
> to getting the parts in place to beable  to untangle the gconf dbus stuff

I think this is a different issue Koen is addressing:

"This makes dbus usable in non-X enviroments like QT/e"

and is a tangential issue as far as I can see. My comment stands as
images will have dbus-launch missing as far as I can tell as its not an
automatically detected dependency.

Cheers,

Richard
Koen Kooi - May 26, 2011, 6:39 a.m.
Op 25 mei 2011, om 23:43 heeft Richard Purdie het volgende geschreven:

> On Wed, 2011-05-25 at 22:18 +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.
> 
> Which pieces of the system use dbus-launch and do we need to add
> dependencies to them after this change to pull in the dbus-x11 package?

From OE .dev:

koen@dominion:/OE/angstrom-v2011/sources/openembedded$ git grep dbus-x11
recipes/angstrom/angstrom-x11-base-depends.bb:    dbus-x11 \
recipes/gnome/gconf_2.28.0.bb:RDEPENDS_${PN} += "dbus-x11"
recipes/gnome/gdm_2.30.0.bb:RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
recipes/shr/shr-settings_git.bb:RDEPENDS_${PN} = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneuti
recipes/tasks/angstrom-task-gnome.bb:  dbus-x11 \
recipes/tasks/angstrom-task-lxde.bb:  dbus-x11 \
recipes/tasks/task-bug.bb:                  dbus-x11 \
recipes/tasks/task-shr-feed.bb:         dbus-x11 \
recipes/vagalume/vagalume_0.7.1.bb:RRECOMMENDS_${PN} = "dbus-x11"
recipes/vagalume/vagalume_0.8.3.bb:RRECOMMENDS_${PN} = "dbus-x11 hicolor-icon-theme"
recipes/xfce-base/xfce4-session_4.6.1.bb:RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11"
recipes/xfce-base/xfce4-session_4.6.2.bb:RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11"

The gconf in meta-oe has the dbus-x11 dep.

In OE-core:

koen@dominion:/OE/tentacle/sources/openembedded-core$ git grep dbus-launch
meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run:dbus-launch $@
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession:if [ -x /usr/bin/dbus-launch ]; then
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession:    eval `dbus-launch --sh-syntax --exit-with-session </dev/null`

So those would need changing. I'll send followup patches for qemu-config and x11-common.

regards,

Koen

Patch

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"