From: Denys Dmytriyenko <de...@ti.com>

New 2015.05 binary release has libc-${ELT_VER_LIBC}.so in /libc/usr/lib/
Check there to extract version, if can't find it in /libc/lib/

Signed-off-by: Denys Dmytriyenko <de...@ti.com>
---
 .../distro/include/external-linaro-toolchain-versions.inc  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git 
a/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc
 
b/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc
index 6165520..eb5a0f8 100644
--- 
a/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc
+++ 
b/meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc
@@ -59,6 +59,20 @@ def elt_get_libc_version(d):
                for file in os.listdir(libpath):
                        if file.find('libc-') == 0:
                                return file[5:-3]
+
+       libpath = syspath + '/libc/usr/lib/' + 
bb.data.expand('${ELT_TARGET_SYS}/', d)
+
+       if os.path.exists(libpath):
+               for file in os.listdir(libpath):
+                       if file.find('libc-') == 0:
+                               return file[5:-3]
+
+       libpath = syspath + '/libc/usr/lib/'
+
+       if os.path.exists(libpath):
+               for file in os.listdir(libpath):
+                       if file.find('libc-') == 0:
+                               return file[5:-3]
        return 'UNKNOWN'
 
 def elt_get_kernel_version(d):
-- 
2.2.0

_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/linaro-dev

Reply via email to