aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-12-01 10:17:51 +0100
committerKoen Kooi <koen.kooi@linaro.org>2014-12-01 10:18:24 +0100
commit65ff15ec4a566dedff8bc2211ac3c3ff81e82259 (patch)
tree31afc0157b989185b9054c3dc1d7258e73b21f7f
parent999f35e2f0829a0528eace105c3159d665d04cf9 (diff)
downloadmeta-linaro-65ff15ec4a566dedff8bc2211ac3c3ff81e82259.tar.gz
external-linaro-toolchain-versions.inc: add support for cbuild2 version parsing
Change-Id: I45a7f8899f28be12abb820be734525fa8c36f041 Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-linaro-toolchain/conf/distro/include/external-linaro-toolchain-versions.inc5
1 files changed, 4 insertions, 1 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 02548958..6165520a 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
@@ -26,7 +26,10 @@ def elt_get_version(d):
def elt_get_main_version(d):
version = elt_get_version(d)
if version != 'UNKNOWN':
- return version.split()[6].split('-')[3]
+ if version.split()[5] != '(crosstool-NG':
+ return version.split()[7].split(')')[0]
+ else:
+ return version.split()[6].split('-')[3]
else:
return version