[PATCH] dbus: include dbus-launch in the main dbus package

[PATCH] dbus: include dbus-launch in the main dbus package

[Radu Moisan]

Followed suggestions from Bugz 2261:

2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature.
This makes the build dependencies reflect the feature list.

3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
is now back in dbus where is belongs.

4) make dbus provide dbus-x11, for compatibility.

Fixes [Yocto #2261]

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 meta/recipes-core/dbus/dbus.inc |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a75583d..8a9edaa 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -31,10 +31,12 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
 DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
+PACKAGES =+ "${PN}-lib ${PN}-systemd"
 
-FILES_${PN}-x11 = "${bindir}/dbus-launch"
-RDEPENDS_${PN}-x11 = "${PN}"
+# for compatibility
+PROVIDES = "dbus-x11"
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"
 
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
@@ -43,6 +45,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-cleanup-sockets \
                ${bindir}/dbus-send \
                ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                ${libexecdir}/dbus* \
                ${sysconfdir} \
                ${localstatedir} \
@@ -59,7 +62,7 @@ pkg_postinst_dbus() {
 }
 
 EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
 EXTRA_OECONF = "--disable-tests \
                 --disable-checks \
-- 
1.7.9.5

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Burton, Ross]

On 30 July 2012 12:24, Radu Moisan <radu.moisan@intel.com> wrote:
> +PROVIDES = "dbus-x11"

The provides that provide comparability were RPROVIDES/RREPLACES, this
doesn't do anything because nothing should be DEPENDing on dbus-x11,
so you can remove it.

Ross

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Radu Moisan]

this is what my intention was as well, but nobody confirmed when I asked 
about it. I'll prepare another patch.

Radu

On 07/30/2012 06:07 PM, Burton, Ross wrote:
> On 30 July 2012 12:24, Radu Moisan <radu.moisan@intel.com> wrote:
>> +PROVIDES = "dbus-x11"
> The provides that provide comparability were RPROVIDES/RREPLACES, this
> doesn't do anything because nothing should be DEPENDing on dbus-x11,
> so you can remove it.
>
> Ross
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[PATCH] dbus: include dbus-launch in the main dbus package

[Radu Moisan]

Followed suggestions from Bugz 2261:

1) remove the --with-x/--without-x configure arguments. If you want to force
no-discovery for native builds the correct argument is --disable-x11-autolaunch.
This ensures that DBus looks at the build environment to determine whether to
enable X11 bus discovery or not.

2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature.
This makes the build dependencies reflect the feature list.

3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
is now back in dbus where is belongs.

4) Potentially make dbus provide dbus-x11, for compatibility.

Fixes [Yocto #2261]

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 meta/recipes-core/dbus/dbus.inc |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a75583d..903f232 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -31,10 +31,9 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
 DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
-
-FILES_${PN}-x11 = "${bindir}/dbus-launch"
-RDEPENDS_${PN}-x11 = "${PN}"
+PACKAGES =+ "${PN}-lib ${PN}-systemd"
+# for compatibility
+RPROVIDES = "${PN}-x11"
 
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
@@ -43,6 +42,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-cleanup-sockets \
                ${bindir}/dbus-send \
                ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                ${libexecdir}/dbus* \
                ${sysconfdir} \
                ${localstatedir} \
@@ -58,8 +58,8 @@ pkg_postinst_dbus() {
 	fi
 }
 
-EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X = ""
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
 EXTRA_OECONF = "--disable-tests \
                 --disable-checks \
-- 
1.7.9.5

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Phil Blundell]

On Wed, 2012-07-25 at 17:03 +0300, Radu Moisan wrote:
> +# for compatibility
> +RPROVIDES = "${PN}-x11"

ITYM RPROVIDES_${PN}.  Isn't that a QA error?

p.

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Koen Kooi]

Op 25 jul. 2012, om 15:58 heeft Phil Blundell het volgende geschreven:

> On Wed, 2012-07-25 at 17:03 +0300, Radu Moisan wrote:
>> +# for compatibility
>> +RPROVIDES = "${PN}-x11"
> 
> ITYM RPROVIDES_${PN}.  Isn't that a QA error?

Sadly not, you need to run kergoths recipe_sanity manually to catch this one.

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Koen Kooi]

Op 25 jul. 2012, om 16:03 heeft Radu Moisan het volgende geschreven:

> Followed suggestions from Bugz 2261:
> 
> 1) remove the --with-x/--without-x configure arguments. If you want to force
> no-discovery for native builds the correct argument is --disable-x11-autolaunch.
> This ensures that DBus looks at the build environment to determine whether to
> enable X11 bus discovery or not.
> 
> 2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature.
> This makes the build dependencies reflect the feature list.
> 
> 3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
> is now back in dbus where is belongs.
> 
> 4) Potentially make dbus provide dbus-x11, for compatibility.

This breaks the upgrade path

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Burton, Ross]

On 25 July 2012 15:17, Koen Kooi <koen@dominion.thruhere.net> wrote:
> This breaks the upgrade path

So how would the upgrade path be unbroken?  A dummy dbus-x11 package
that pulls in dbus, I suspect.

Ross

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Paul Eggleton]

On Wednesday 25 July 2012 15:19:10 Burton, Ross wrote:
> On 25 July 2012 15:17, Koen Kooi <koen@dominion.thruhere.net> wrote:
> > This breaks the upgrade path
> 
> So how would the upgrade path be unbroken?  A dummy dbus-x11 package
> that pulls in dbus, I suspect.

RREPLACES_${PN} += "dbus-x11" ought to be enough...

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Burton, Ross]

On 25 July 2012 15:23, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> On Wednesday 25 July 2012 15:19:10 Burton, Ross wrote:
>> On 25 July 2012 15:17, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> > This breaks the upgrade path
>>
>> So how would the upgrade path be unbroken?  A dummy dbus-x11 package
>> that pulls in dbus, I suspect.
>
> RREPLACES_${PN} += "dbus-x11" ought to be enough...

Sweet (makes mental note)

Ross

Re: [PATCH] dbus: include dbus-launch in the main dbus package

[Koen Kooi]

Op 25 jul. 2012, om 16:23 heeft Paul Eggleton het volgende geschreven:

> On Wednesday 25 July 2012 15:19:10 Burton, Ross wrote:
>> On 25 July 2012 15:17, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>> This breaks the upgrade path
>> 
>> So how would the upgrade path be unbroken?  A dummy dbus-x11 package
>> that pulls in dbus, I suspect.
> 
> RREPLACES_${PN} += "dbus-x11" ought to be enough...

Right, but since that's missing -> broken upgrade path