diff options
author | Denys Dmytriyenko <denys@ti.com> | 2015-08-14 14:12:45 -0400 |
---|---|---|
committer | Koen Kooi <koen.kooi@linaro.org> | 2015-09-02 07:56:33 +0200 |
commit | a7674d8bf646ad5dcf20e1d4f772707d78889d8a (patch) | |
tree | 490c4370633de1169489eeb280b8bd834a5069b8 | |
parent | 9072194091439dc30931c38b2498c16e71b43165 (diff) |
external-linaro-toolchain-versions: update ELT_VER_LIBC for new dir structure
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/
Change-Id: Ibaade01fbb6e6dbb36d3b82cb335e4d5e5a2315a
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r-- | meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc | 14 |
1 files changed, 14 insertions, 0 deletions
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 6165520a..eb5a0f88 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): |