On 25.12.2014 03:09, Masahiro Yamada wrote:
The current binutils-version.sh expects the version string at the end of the first line. It turned out to not work with Linaro toolchain: It has "Linaro 2014.09" at the back.
To fix this issue, let's parse the word right after the close parenthesis.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Reported-by: York Sun yorksun@freescale.com
Acked-by: Dirk Behme dirk.behme@gmail.com
This fixes the issue [1] for me :)
I'd propose to apply this to 2015.01-rc3.
Thanks!
Dirk
[1] http://lists.denx.de/pipermail/u-boot/2014-December/199515.html
scripts/binutils-version.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/binutils-version.sh b/scripts/binutils-version.sh index d4d9eb4..0bc26cf 100755 --- a/scripts/binutils-version.sh +++ b/scripts/binutils-version.sh @@ -14,7 +14,9 @@ if [ ${#gas} -eq 0 ]; then exit 1 fi
-MAJOR=$($gas --version | head -1 | awk '{print $NF}' | cut -d . -f 1) -MINOR=$($gas --version | head -1 | awk '{print $NF}' | cut -d . -f 2) +version_string=$($gas --version | head -1 | sed -e 's/.*) *([0-9.]*).*/\1/' )
+MAJOR=$(echo $version_string | cut -d . -f 1) +MINOR=$(echo $version_string | cut -d . -f 2)
printf "%02d%02d\n" $MAJOR $MINOR