Patchwork [1/2] libc-common: Allow debug package to append, not set depends

login
register
mail settings
Submitter Mark Hatle
Date June 30, 2012, 12:22 a.m.
Message ID <3112d19714501de42e197c3e05247065bbfea57a.1341015667.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/30917/
State Accepted
Commit fa1c7b797593cbd5e82dc264bde2667620eb0515
Headers show

Comments

Mark Hatle - June 30, 2012, 12:22 a.m.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/libc-common.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Phil Blundell - July 2, 2012, 8:26 p.m.
On Fri, 2012-06-29 at 19:22 -0500, Mark Hatle wrote:
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

This patch has no checkin message (other than the subject line) which is
contrary to our fine guidelines.  What bug is this fixing?

Also, the subject line talks about "depends" but the patch actually
modifies the way that RPROVIDES/RCONFLICTS/RREPLACES are set and I'm not
sure that most people would class those as "depends".

p.
 
> ---
>  meta/classes/libc-common.bbclass |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
> index 9b91f0a..8145d64 100644
> --- a/meta/classes/libc-common.bbclass
> +++ b/meta/classes/libc-common.bbclass
> @@ -29,7 +29,7 @@ python populate_packages_prepend () {
>  		d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
>  		d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
>  		# For backward compatibility with old -dbg package
> -		d.setVar('RPROVIDES_' + bpn + '-dbg', 'libc-dbg')
> -		d.setVar('RCONFLICTS_' + bpn + '-dbg', 'libc-dbg')
> -		d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg')
> +		d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
> +		d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
> +		d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
>  }
Mark Hatle - July 2, 2012, 8:37 p.m.
On 7/2/12 3:26 PM, Phil Blundell wrote:
> On Fri, 2012-06-29 at 19:22 -0500, Mark Hatle wrote:
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>
> This patch has no checkin message (other than the subject line) which is
> contrary to our fine guidelines.  What bug is this fixing?

Exactly what the subject is.  The libc-common.bbclass needs to be able to append 
the RPROVIDES, RCONFLICT_, RREPLACES_ and not just -set- them.

The guidelines say that if the subject and code explain what is being changed, 
then repeating the subject is frowned upon.

> Also, the subject line talks about "depends" but the patch actually
> modifies the way that RPROVIDES/RCONFLICTS/RREPLACES are set and I'm not
> sure that most people would class those as "depends".

Sorry, terminology then.. I consider these all depends.

I can reword it, but it was clear to me when I wrote it that the subject and 
patch itself explained what was happening.

--Mark

> p.
>
>> ---
>>   meta/classes/libc-common.bbclass |    6 +++---
>>   1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
>> index 9b91f0a..8145d64 100644
>> --- a/meta/classes/libc-common.bbclass
>> +++ b/meta/classes/libc-common.bbclass
>> @@ -29,7 +29,7 @@ python populate_packages_prepend () {
>>   		d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
>>   		d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
>>   		# For backward compatibility with old -dbg package
>> -		d.setVar('RPROVIDES_' + bpn + '-dbg', 'libc-dbg')
>> -		d.setVar('RCONFLICTS_' + bpn + '-dbg', 'libc-dbg')
>> -		d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg')
>> +		d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
>> +		d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
>> +		d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
>>   }
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 9b91f0a..8145d64 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -29,7 +29,7 @@  python populate_packages_prepend () {
 		d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
 		d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
 		# For backward compatibility with old -dbg package
-		d.setVar('RPROVIDES_' + bpn + '-dbg', 'libc-dbg')
-		d.setVar('RCONFLICTS_' + bpn + '-dbg', 'libc-dbg')
-		d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg')
+		d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
+		d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
+		d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
 }