diff options
| author | Bill Pringlemeir <bpringlemeir@nbsps.com> | 2015-01-07 10:34:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-08 11:00:45 -0500 |
| commit | b6b1b44586778885f37e1a2f2b17da7ddb04d565 (patch) | |
| tree | 15899ecd0ddedc38ddbad2be6229b93076556c5d | |
| parent | b4ad44baab713af371b1113dd63dd222ba73ba13 (diff) | |
| download | u-boot-imx-b6b1b44586778885f37e1a2f2b17da7ddb04d565.zip u-boot-imx-b6b1b44586778885f37e1a2f2b17da7ddb04d565.tar.gz u-boot-imx-b6b1b44586778885f37e1a2f2b17da7ddb04d565.tar.bz2 | |
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>
| -rwxr-xr-x | scripts/binutils-version.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/binutils-version.sh b/scripts/binutils-version.sh index 0bc26cf..a343681 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) |