Patchwork [meta-oe,v2] libjpeg-turbo: Add RPROVIDES to fix errors when rdepending on jpeg

login
register
mail settings
Submitter Samuel Stirtzel
Date Oct. 22, 2012, 9:59 a.m.
Message ID <1350899940-2274-1-git-send-email-s.stirtzel@googlemail.com>
Download mbox | patch
Permalink /patch/38401/
State Accepted
Headers show

Comments

Samuel Stirtzel - Oct. 22, 2012, 9:59 a.m.
This fixes "ERROR: Multiple .bb files are due to be built which each provide jpeg"

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
 meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb |    3 +++
 1 file changed, 3 insertions(+)
chase maupin - Oct. 22, 2012, 1:03 p.m.
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On
> Behalf Of Samuel Stirtzel
> Sent: Monday, October 22, 2012 4:59 AM
> To: openembedded-devel@lists.openembedded.org
> Subject: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add RPROVIDES to
> fix errors when rdepending on jpeg
> 
> This fixes "ERROR: Multiple .bb files are due to be built which
> each provide jpeg"
> 
> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> ---
>  meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> index 2aefe1f..303bbae 100644
> --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> @@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk"
> 
>  # Drop-in replacement for jpeg
>  PROVIDES = "jpeg"
> +RPROVIDES_${PN} += "jpeg"
> +RREPLACES_${PN} += "jpeg"
> +RCONFLICTS_${PN} += "jpeg"

Does this need a PR bump?  Aside from that this has my ack.

> 
>  inherit autotools pkgconfig
> 
> --
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-
> devel
Samuel Stirtzel - Oct. 22, 2012, 1:20 p.m.
2012/10/22 Maupin, Chase <chase.maupin@ti.com>:
>> -----Original Message-----
>> From: openembedded-devel-bounces@lists.openembedded.org
>> [mailto:openembedded-devel-bounces@lists.openembedded.org] On
>> Behalf Of Samuel Stirtzel
>> Sent: Monday, October 22, 2012 4:59 AM
>> To: openembedded-devel@lists.openembedded.org
>> Subject: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add RPROVIDES to
>> fix errors when rdepending on jpeg
>>
>> This fixes "ERROR: Multiple .bb files are due to be built which
>> each provide jpeg"
>>
>> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
>> ---
>>  meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb |    3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
>> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
>> index 2aefe1f..303bbae 100644
>> --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
>> +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
>> @@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk"
>>
>>  # Drop-in replacement for jpeg
>>  PROVIDES = "jpeg"
>> +RPROVIDES_${PN} += "jpeg"
>> +RREPLACES_${PN} += "jpeg"
>> +RCONFLICTS_${PN} += "jpeg"
>
> Does this need a PR bump?  Aside from that this has my ack.
>

The error message disappeared without PR bumps or rebuilding.
Hopefully it doesn't need one, as that would trigger a rebuild of many
recipes (like Qt, gtk+, gtk+3)
Martin Jansa - Oct. 22, 2012, 1:22 p.m.
On Mon, Oct 22, 2012 at 03:20:35PM +0200, Samuel Stirtzel wrote:
> 2012/10/22 Maupin, Chase <chase.maupin@ti.com>:
> >> -----Original Message-----
> >> From: openembedded-devel-bounces@lists.openembedded.org
> >> [mailto:openembedded-devel-bounces@lists.openembedded.org] On
> >> Behalf Of Samuel Stirtzel
> >> Sent: Monday, October 22, 2012 4:59 AM
> >> To: openembedded-devel@lists.openembedded.org
> >> Subject: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add RPROVIDES to
> >> fix errors when rdepending on jpeg
> >>
> >> This fixes "ERROR: Multiple .bb files are due to be built which
> >> each provide jpeg"
> >>
> >> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> >> ---
> >>  meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb |    3 +++
> >>  1 file changed, 3 insertions(+)
> >>
> >> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> >> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> >> index 2aefe1f..303bbae 100644
> >> --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> >> +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> >> @@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk"
> >>
> >>  # Drop-in replacement for jpeg
> >>  PROVIDES = "jpeg"
> >> +RPROVIDES_${PN} += "jpeg"
> >> +RREPLACES_${PN} += "jpeg"
> >> +RCONFLICTS_${PN} += "jpeg"
> >
> > Does this need a PR bump?  Aside from that this has my ack.
> >
> 
> The error message disappeared without PR bumps or rebuilding.
> Hopefully it doesn't need one, as that would trigger a rebuild of many
> recipes (like Qt, gtk+, gtk+3)

It needs one to replace jpeg with libjpeg-turbo on target.

opkg won't replace it without PR bump afaik

Cheers,
chase maupin - Oct. 22, 2012, 1:26 p.m.
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On
> Behalf Of Martin Jansa
> Sent: Monday, October 22, 2012 8:23 AM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add
> RPROVIDES to fix errors when rdepending on jpeg
> 
> On Mon, Oct 22, 2012 at 03:20:35PM +0200, Samuel Stirtzel wrote:
> > 2012/10/22 Maupin, Chase <chase.maupin@ti.com>:
> > >> -----Original Message-----
> > >> From: openembedded-devel-bounces@lists.openembedded.org
> > >> [mailto:openembedded-devel-bounces@lists.openembedded.org]
> On
> > >> Behalf Of Samuel Stirtzel
> > >> Sent: Monday, October 22, 2012 4:59 AM
> > >> To: openembedded-devel@lists.openembedded.org
> > >> Subject: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add
> RPROVIDES to
> > >> fix errors when rdepending on jpeg
> > >>
> > >> This fixes "ERROR: Multiple .bb files are due to be built
> which
> > >> each provide jpeg"
> > >>
> > >> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> > >> ---
> > >>  meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb |    3 +++
> > >>  1 file changed, 3 insertions(+)
> > >>
> > >> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > >> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > >> index 2aefe1f..303bbae 100644
> > >> --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > >> +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > >> @@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk"
> > >>
> > >>  # Drop-in replacement for jpeg
> > >>  PROVIDES = "jpeg"
> > >> +RPROVIDES_${PN} += "jpeg"
> > >> +RREPLACES_${PN} += "jpeg"
> > >> +RCONFLICTS_${PN} += "jpeg"
> > >
> > > Does this need a PR bump?  Aside from that this has my ack.
> > >
> >
> > The error message disappeared without PR bumps or rebuilding.
> > Hopefully it doesn't need one, as that would trigger a rebuild
> of many
> > recipes (like Qt, gtk+, gtk+3)
> 
> It needs one to replace jpeg with libjpeg-turbo on target.
> 
> opkg won't replace it without PR bump afaik

And it should not force a rebuild of the other packages I believe.    But maybe this is a new behaviour.

> 
> Cheers,
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
Martin Jansa - Oct. 22, 2012, 1:30 p.m.
On Mon, Oct 22, 2012 at 01:26:59PM +0000, Maupin, Chase wrote:
> > -----Original Message-----
> > From: openembedded-devel-bounces@lists.openembedded.org
> > [mailto:openembedded-devel-bounces@lists.openembedded.org] On
> > Behalf Of Martin Jansa
> > Sent: Monday, October 22, 2012 8:23 AM
> > To: openembedded-devel@lists.openembedded.org
> > Subject: Re: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add
> > RPROVIDES to fix errors when rdepending on jpeg
> > 
> > On Mon, Oct 22, 2012 at 03:20:35PM +0200, Samuel Stirtzel wrote:
> > > 2012/10/22 Maupin, Chase <chase.maupin@ti.com>:
> > > >> -----Original Message-----
> > > >> From: openembedded-devel-bounces@lists.openembedded.org
> > > >> [mailto:openembedded-devel-bounces@lists.openembedded.org]
> > On
> > > >> Behalf Of Samuel Stirtzel
> > > >> Sent: Monday, October 22, 2012 4:59 AM
> > > >> To: openembedded-devel@lists.openembedded.org
> > > >> Subject: [oe] [meta-oe][PATCH v2] libjpeg-turbo: Add
> > RPROVIDES to
> > > >> fix errors when rdepending on jpeg
> > > >>
> > > >> This fixes "ERROR: Multiple .bb files are due to be built
> > which
> > > >> each provide jpeg"
> > > >>
> > > >> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> > > >> ---
> > > >>  meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb |    3 +++
> > > >>  1 file changed, 3 insertions(+)
> > > >>
> > > >> diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > > >> b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > > >> index 2aefe1f..303bbae 100644
> > > >> --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > > >> +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
> > > >> @@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk"
> > > >>
> > > >>  # Drop-in replacement for jpeg
> > > >>  PROVIDES = "jpeg"
> > > >> +RPROVIDES_${PN} += "jpeg"
> > > >> +RREPLACES_${PN} += "jpeg"
> > > >> +RCONFLICTS_${PN} += "jpeg"
> > > >
> > > > Does this need a PR bump?  Aside from that this has my ack.
> > > >
> > >
> > > The error message disappeared without PR bumps or rebuilding.
> > > Hopefully it doesn't need one, as that would trigger a rebuild
> > of many
> > > recipes (like Qt, gtk+, gtk+3)
> > 
> > It needs one to replace jpeg with libjpeg-turbo on target.
> > 
> > opkg won't replace it without PR bump afaik
> 
> And it should not force a rebuild of the other packages I believe.    But maybe this is a new behaviour.

It does with OEBasicHash, but what doesn't..

Cheers,

Patch

diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
index 2aefe1f..303bbae 100644
--- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
+++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
@@ -15,6 +15,9 @@  S = "${WORKDIR}/trunk"
 
 # Drop-in replacement for jpeg
 PROVIDES = "jpeg"
+RPROVIDES_${PN} += "jpeg"
+RREPLACES_${PN} += "jpeg"
+RCONFLICTS_${PN} += "jpeg"
 
 inherit autotools pkgconfig