[PATCH] package.bbclass: Fix support for private libs

[PATCH] package.bbclass: Fix support for private libs

[Martin Jansa]

* n is a tuple since this commit:
  commit d3aa7668a9f001044d0a0f1ba2de425a36056102
  Author: Richard Purdie <richard.purdie@linuxfoundation.org>
  Date:   Mon Jul 7 18:41:23 2014 +0100
  Subject package.bbclass: Improve shlibs needed data structure

  since then 'n in private_libs' was always false and private libs
  were always processed
* this is bad when we have libfoo in private libs, but also some package
  providing libfoo, that way we ship own libfoo.so, but together with
  runtime dependency on package providing libfoo

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fc501fc..31c9e08 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1574,7 +1574,7 @@ python package_do_shlibs() {
             # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1
             # but skipping it is still better alternative than providing own
             # version and then adding runtime dependency for the same system library
-            if private_libs and n in private_libs:
+            if private_libs and n[0] in private_libs:
                 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
                 continue
             if n[0] in shlib_provider.keys():
-- 
2.2.1

Re: [PATCH] package.bbclass: Fix support for private libs

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1718 bytes --]

On Thu, Jan 08, 2015 at 06:11:18PM +0100, Martin Jansa wrote:
> * n is a tuple since this commit:
>   commit d3aa7668a9f001044d0a0f1ba2de425a36056102
>   Author: Richard Purdie <richard.purdie@linuxfoundation.org>
>   Date:   Mon Jul 7 18:41:23 2014 +0100
>   Subject package.bbclass: Improve shlibs needed data structure
> 
>   since then 'n in private_libs' was always false and private libs
>   were always processed
> * this is bad when we have libfoo in private libs, but also some package
>   providing libfoo, that way we ship own libfoo.so, but together with
>   runtime dependency on package providing libfoo

ping, please merge this to dizzy as well.

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/package.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index fc501fc..31c9e08 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -1574,7 +1574,7 @@ python package_do_shlibs() {
>              # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1
>              # but skipping it is still better alternative than providing own
>              # version and then adding runtime dependency for the same system library
> -            if private_libs and n in private_libs:
> +            if private_libs and n[0] in private_libs:
>                  bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
>                  continue
>              if n[0] in shlib_provider.keys():
> -- 
> 2.2.1
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH] package.bbclass: Fix support for private libs

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

On 15 January 2015 at 15:33, Martin Jansa <martin.jansa@gmail.com> wrote:

> ping, please merge this to dizzy as well.
>

This is in my MUT but we've been stalling on merging anything into master
until the kernel builds are fixed.

Ross

[-- Attachment #2: Type: text/html, Size: 658 bytes --]