Browse Source

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>
master
Bill Pringlemeir 5 years ago
committed by Tom Rini
parent
commit
b6b1b44586
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      scripts/binutils-version.sh

+ 2
- 1
scripts/binutils-version.sh View File

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


Loading…
Cancel
Save