[PATCH] sanity.bbclass: some multilib systems have symlink /lib -> /lib64

[PATCH] sanity.bbclass: some multilib systems have symlink /lib -> /lib64

[Martin Jansa]

* ie gentoo has /lib -> /lib64
* old test assumed only /lib64 -> /lib

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 13940f8..433313b 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -211,7 +211,7 @@ def check_sanity(e):
     nolibs = data.getVar('NO32LIBS', e.data, True)
     if not nolibs:
         lib32path = '/lib'
-        if os.path.exists('/lib64') and os.path.islink('/lib64'):
+        if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
            lib32path = '/lib32'
 
         if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
-- 
1.7.4.1

Re: [PATCH] sanity.bbclass: some multilib systems have symlink /lib -> /lib64

[Koen Kooi]

Op 3 mrt 2011, om 10:39 heeft Martin Jansa het volgende geschreven:

> * ie gentoo has /lib -> /lib64
> * old test assumed only /lib64 -> /lib
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Looks good to me:

Acked-by: Koen Kooi <koen@dominion.thruhere.net>


> ---
> meta/classes/sanity.bbclass |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 13940f8..433313b 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -211,7 +211,7 @@ def check_sanity(e):
>     nolibs = data.getVar('NO32LIBS', e.data, True)
>     if not nolibs:
>         lib32path = '/lib'
> -        if os.path.exists('/lib64') and os.path.islink('/lib64'):
> +        if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
>            lib32path = '/lib32'
> 
>         if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH] sanity.bbclass: some multilib systems have symlink /lib -> /lib64

[Richard Purdie]

On Thu, 2011-03-03 at 10:39 +0100, Martin Jansa wrote:
> * ie gentoo has /lib -> /lib64
> * old test assumed only /lib64 -> /lib
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/sanity.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 13940f8..433313b 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -211,7 +211,7 @@ def check_sanity(e):
>      nolibs = data.getVar('NO32LIBS', e.data, True)
>      if not nolibs:
>          lib32path = '/lib'
> -        if os.path.exists('/lib64') and os.path.islink('/lib64'):
> +        if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
>             lib32path = '/lib32'
>  
>          if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):

Merged to master, thanks.

Richard