From: Bill Pringlemeir <bpringlemeir@nbsps.com>
Date: Wed, 7 Jan 2015 15:34:15 +0000 (-0500)
Subject: scripts: fix binutils-version.sh for 'as' without a package.
X-Git-Tag: v2015.01~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b6b1b44586778885f37e1a2f2b17da7ddb04d565;p=u-boot

scripts: fix binutils-version.sh for 'as' without a package.

Commit 73c25753 fixed the common issue that binutil packages (tool/organization
that packaged or built the bin-utils) are included in brackets and this may
falsely be recognized as a version.  However, some tools do not provide a
'package' and previously we add the 'Gnu assembler..' to the version.

Strip out the '(package version text)' and then look for a ##.## string.

Signed-off-by: Bill Pringlemeir <bpringlemeir@nbsps.com>
Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/scripts/binutils-version.sh b/scripts/binutils-version.sh
index 0bc26cf925..a34368184f 100755
--- a/scripts/binutils-version.sh
+++ b/scripts/binutils-version.sh
@@ -14,7 +14,8 @@ if [ ${#gas} -eq 0 ]; then
 	exit 1
 fi
 
-version_string=$($gas --version | head -1 | sed -e 's/.*) *\([0-9.]*\).*/\1/' )
+version_string=$($gas --version | head -1 | \
+	sed -e 's/(.*)//; s/[^0-9.]*\([0-9.]*\).*/\1/')
 
 MAJOR=$(echo $version_string | cut -d . -f 1)
 MINOR=$(echo $version_string | cut -d . -f 2)