aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2015-08-14 14:12:45 -0400
committerKoen Kooi <koen.kooi@linaro.org>2015-08-14 20:26:20 +0200
commitb532e0b6a695d602dacff282a18e9ebe9bcc0514 (patch)
tree6a657cbcee17d3d4530a0cb28984b93a80cf35f9
parent2084b7a74c317130f4bdba59b156e2a4db972b10 (diff)
downloadmeta-linaro-b532e0b6a695d602dacff282a18e9ebe9bcc0514.tar.gz
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.inc14
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):