From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Thu, 25 Dec 2014 02:09:44 +0000 (+0900)
Subject: scripts: fix binutils-version.sh
X-Git-Tag: v2015.01-rc4~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=73c25753060c58e4c339fba306ed0ded0c335748;p=oweals%2Fu-boot.git

scripts: fix binutils-version.sh

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>
---

diff --git a/scripts/binutils-version.sh b/scripts/binutils-version.sh
index d4d9eb4361..0bc26cf925 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