From 4228b31e449cacbf3d4270ed377f741a873183ea Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 23 Oct 2013 15:59:49 -0400 Subject: [PATCH] csl-versions: improve main ver for Preview releases Signed-off-by: Christopher Larson --- conf/distro/include/csl-versions.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/csl-versions.inc b/conf/distro/include/csl-versions.inc index f622bea..7e45ed8 100644 --- a/conf/distro/include/csl-versions.inc +++ b/conf/distro/include/csl-versions.inc @@ -20,13 +20,16 @@ def csl_get_version(d): bb.error('Failed to obtain CodeSourcery toolchain version: %s' % exc) return 'UNKNOWN' else: - last_line = stderr.splitlines()[-1] + last_line = stderr.splitlines()[-1].rstrip() return last_line def csl_get_main_version(d): version = csl_get_version(d) if version != 'UNKNOWN': - return version.split()[-1].rstrip(')') + main_version = version.split()[-1].rstrip(')') + if main_version == 'Preview': + main_version = version.split()[-3] + return main_version else: return version