Patchwork dbus: Ensure dbus-nativesdk doesn't RPROVIDE dbus-x11

login
register
mail settings
Submitter Richard Purdie
Date Aug. 1, 2012, 9:54 p.m.
Message ID <1343858083.9756.63.camel@ted>
Download mbox | patch
Permalink /patch/33603/
State Accepted
Commit 09e3ebdb77c090ddc45fed7c6acc1591cd4b3595
Headers show

Comments

Richard Purdie - Aug. 1, 2012, 9:54 p.m.
dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses
builds. This fixes the nativesdk case.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Martin Jansa - Aug. 1, 2012, 10:03 p.m.
On Wed, Aug 01, 2012 at 10:54:43PM +0100, Richard Purdie wrote:
> dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses
> builds. This fixes the nativesdk case.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> index 164c4d3..1984c74 100644
> --- a/meta/recipes-core/dbus/dbus.inc
> +++ b/meta/recipes-core/dbus/dbus.inc
> @@ -33,9 +33,12 @@ DEBIANNAME_${PN} = "dbus-1"
>  
>  PACKAGES =+ "${PN}-lib ${PN}-systemd"
>  
> +OLDPKGNAME = "dbus-x11"
> +OLDPKGNAME_virtclass-nativesdk = ""
> +
>  # for compatibility
> -RPROVIDES_${PN} = "dbus-x11"
> -RREPLACES_${PN} += "dbus-x11"
> +RPROVIDES_${PN} = "${OLDPKGNAME}"
> +RREPLACES_${PN} += "${OLDPKGNAME}"

what about this?
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026947.html

>  
>  FILES_${PN}-systemd = "${systemd_unitdir}/system/"
>  
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - Aug. 1, 2012, 10:09 p.m.
On Thu, 2012-08-02 at 00:03 +0200, Martin Jansa wrote:
> On Wed, Aug 01, 2012 at 10:54:43PM +0100, Richard Purdie wrote:
> > dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses
> > builds. This fixes the nativesdk case.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> > index 164c4d3..1984c74 100644
> > --- a/meta/recipes-core/dbus/dbus.inc
> > +++ b/meta/recipes-core/dbus/dbus.inc
> > @@ -33,9 +33,12 @@ DEBIANNAME_${PN} = "dbus-1"
> >  
> >  PACKAGES =+ "${PN}-lib ${PN}-systemd"
> >  
> > +OLDPKGNAME = "dbus-x11"
> > +OLDPKGNAME_virtclass-nativesdk = ""
> > +
> >  # for compatibility
> > -RPROVIDES_${PN} = "dbus-x11"
> > -RREPLACES_${PN} += "dbus-x11"
> > +RPROVIDES_${PN} = "${OLDPKGNAME}"
> > +RREPLACES_${PN} += "${OLDPKGNAME}"
> 
> what about this?
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026947.html

They're each different ways to fix the problem. The above just kills the
nativesdk version since I don't think anyone will feel strongly about it
but I don't have strong feelings. I notice Marcin also has a patch out,
for some reason I didn't see that initially :(.

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 164c4d3..1984c74 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -33,9 +33,12 @@  DEBIANNAME_${PN} = "dbus-1"
 
 PACKAGES =+ "${PN}-lib ${PN}-systemd"
 
+OLDPKGNAME = "dbus-x11"
+OLDPKGNAME_virtclass-nativesdk = ""
+
 # for compatibility
-RPROVIDES_${PN} = "dbus-x11"
-RREPLACES_${PN} += "dbus-x11"
+RPROVIDES_${PN} = "${OLDPKGNAME}"
+RREPLACES_${PN} += "${OLDPKGNAME}"
 
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"