[PATCH 0/2] SDK related misc changes

[PATCH 0/2] SDK related misc changes

[Mark Hatle]

Two minor changes related to SDK generations.  One is a bug fix, the other
allows for better control over the per-file dependency generation.

The following changes since commit 54429dfcca0e35a3aeaa78e509240b87d6a8f4ac:

  mklibs-native: Upgrade to 0.1.34 (2012-06-29 13:21:19 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib mhatle/misc
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/sdk

Mark Hatle (2):
  libc-common: Allow debug package to append, not set depends
  package.bbclass: Allow a package to skip per file dependency
    generation

 meta/classes/libc-common.bbclass |    6 +++---
 meta/classes/package.bbclass     |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
1.7.3.4

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

[Mark Hatle]

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 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')
 }
-- 
1.7.3.4

[PATCH 2/2] package.bbclass: Allow a package to skip per file dependency generation

[Mark Hatle]

Most of the time skipping per file dependency generation is a bad idea, but
when building a nativesdk or similar you may be required to pickup host
dependencies.  These host dependencies can not always be reconciled within
the scope of other nativesdk components, so if we skip them we can facilitate
this unique situation.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/package.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 10c2f0a..db7b9ca 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1154,6 +1154,9 @@ RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps-oecore --macros ${STAGING_LI
 python package_do_filedeps() {
 	import re
 
+	if d.getVar('SKIP_FILEDEPS', True) == '1':
+		return
+
 	pkgdest = d.getVar('PKGDEST', True)
 	packages = d.getVar('PACKAGES', True)
 
-- 
1.7.3.4

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

[Phil Blundell]

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')
>  }

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

[Mark Hatle]

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
>