Re: [U-Boot] [PATCH v3] scripts: fix binutils-version.sh for 'as' without a package.

2015-01-08 Thread Masahiro Yamada 

On Wed,  7 Jan 2015 10:34:15 -0500
Bill Pringlemeir bpringlem...@nbsps.com wrote:

 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 bpringlem...@nbsps.com
 ---
  scripts/binutils-version.sh | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 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)
 -- 
 1.8.0.2


Tested-by: Masahiro Yamada yamad...@jp.panasonic.com


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v3] scripts: fix binutils-version.sh for 'as' without a package.

2015-01-08 Thread Hans de Goede 

Hi,

On 07-01-15 16:34, Bill Pringlemeir wrote:

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 bpringlem...@nbsps.com


Thanks, this fixes the errors I was seeing:

Tested-by: Hans de Goede hdego...@redhat.com

Regards,

Hans
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v3] scripts: fix binutils-version.sh for 'as' without a package.

2015-01-07 Thread Bill Pringlemeir 
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 bpringlem...@nbsps.com
---
 scripts/binutils-version.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot