Patchwork libx11-trim/diet: Add RPROVIDES for libx11-dev

login
register
mail settings
Submitter Richard Purdie
Date March 1, 2012, 11:55 a.m.
Message ID <1330602916.31767.3.camel@ted>
Download mbox | patch
Permalink /patch/22525/
State Accepted
Commit c051d6c59c71a5f90c2d545491facd2d131592fd
Headers show

Comments

Richard Purdie - March 1, 2012, 11:55 a.m.
We have things that depend on libx11-dev, this patch ensures the -trim
and -diet versions provide it. This resolves some multiple providers
warnings.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Koen/Saul: This is how I think we should be fixing the libx11 issues...
Martin Jansa - March 1, 2012, 12:02 p.m.
On Thu, Mar 01, 2012 at 11:55:16AM +0000, Richard Purdie wrote:
> We have things that depend on libx11-dev, this patch ensures the -trim
> and -diet versions provide it. This resolves some multiple providers
> warnings.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

It's probably fine now as only libx11_1.4.4.bb has
BBCLASSEXTENDS = "nativesdk native"
but can we use RPROVIDES_${BPN}-dev = "libx11-dev"
?

Cheers,

> ---
> 
> Koen/Saul: This is how I think we should be fixing the libx11 issues...
> 
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
> index 6106986..4bab148 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
> +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
> @@ -14,6 +14,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \
>              file://fix-utf8-wrong-define.patch \
>             "
>  
> +RPROVIDES_${PN}-dev = "libx11-dev"
>  
>  SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
>  SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
> diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
> index 3fd5d82..b2c753d 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
> +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
> @@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
>  LICENSE = "MIT & MIT-style & BSD"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
>  
> @@ -13,6 +13,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \
>              file://keysymdef_include.patch \
>              file://makekeys_crosscompile.patch"
>  
> +RPROVIDES_${PN}-dev = "libx11-dev"
>  
>  SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
>  SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - March 1, 2012, 12:11 p.m.
Op 1 mrt. 2012, om 12:55 heeft Richard Purdie het volgende geschreven:

> We have things that depend on libx11-dev, this patch ensures the -trim
> and -diet versions provide it. This resolves some multiple providers
> warnings.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> 
> Koen/Saul: This is how I think we should be fixing the libx11 issues...

I'm going to say something shockingly out of character: I think the trim/diet/normal seperation should be done with DISTRO_FEATURES + PACKAGECONFIG. Due to shlib naming the 3 recipes cannot coexist in the feeds anyway.

regards,

Koen
Richard Purdie - March 1, 2012, 12:50 p.m.
On Thu, 2012-03-01 at 13:11 +0100, Koen Kooi wrote:
> Op 1 mrt. 2012, om 12:55 heeft Richard Purdie het volgende geschreven:
> 
> > We have things that depend on libx11-dev, this patch ensures the -trim
> > and -diet versions provide it. This resolves some multiple providers
> > warnings.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > 
> > Koen/Saul: This is how I think we should be fixing the libx11 issues...
> 
> I'm going to say something shockingly out of character: I think the
> trim/diet/normal seperation should be done with DISTRO_FEATURES +
> PACKAGECONFIG. Due to shlib naming the 3 recipes cannot coexist in the
> feeds anyway.

I agree although in this case, PACKAGECONFIG should be enough. 

I propose we fix the immediate problem as per the patch and then look at
converting to PACKAGECONFIG.

Cheers,

Richard
Koen Kooi - March 1, 2012, 1:01 p.m.
Op 1 mrt. 2012, om 13:50 heeft Richard Purdie het volgende geschreven:

> On Thu, 2012-03-01 at 13:11 +0100, Koen Kooi wrote:
>> Op 1 mrt. 2012, om 12:55 heeft Richard Purdie het volgende geschreven:
>> 
>>> We have things that depend on libx11-dev, this patch ensures the -trim
>>> and -diet versions provide it. This resolves some multiple providers
>>> warnings.
>>> 
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> ---
>>> 
>>> Koen/Saul: This is how I think we should be fixing the libx11 issues...
>> 
>> I'm going to say something shockingly out of character: I think the
>> trim/diet/normal seperation should be done with DISTRO_FEATURES +
>> PACKAGECONFIG. Due to shlib naming the 3 recipes cannot coexist in the
>> feeds anyway.
> 
> I agree although in this case, PACKAGECONFIG should be enough. 
> 
> I propose we fix the immediate problem as per the patch and then look at
> converting to PACKAGECONFIG.

Agreed.

regards,

Koen

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
index 6106986..4bab148 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
@@ -14,6 +14,7 @@  SRC_URI += "file://x11_disable_makekeys.patch \
             file://fix-utf8-wrong-define.patch \
            "
 
+RPROVIDES_${PN}-dev = "libx11-dev"
 
 SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
 SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
index 3fd5d82..b2c753d 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
@@ -5,7 +5,7 @@  DESCRIPTION += " Support for XCMS is disabled in this version."
 LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
 
@@ -13,6 +13,7 @@  SRC_URI += "file://x11_disable_makekeys.patch \
             file://keysymdef_include.patch \
             file://makekeys_crosscompile.patch"
 
+RPROVIDES_${PN}-dev = "libx11-dev"
 
 SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
 SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"