diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 20:39:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 06:55:26 +0200 |
| commit | 3e2f5cfb38dbd7d0c4a9cfd5093bea4b027a9d6d (patch) | |
| tree | d5b7c58a1e17efec722bb059068357bb8e48f2cb | |
| parent | ver_linux: make --version, use regex to find version number (diff) | |
| download | linux-3e2f5cfb38dbd7d0c4a9cfd5093bea4b027a9d6d.tar.xz linux-3e2f5cfb38dbd7d0c4a9cfd5093bea4b027a9d6d.zip | |
ver_linux: binutils, fix inaccurate output
Current implementation output on Gentoo Linux:
binutils 2.25.1
1.1
2.25.1
Proposed implementation:
Binutils 2.25.1
Tested on:
Gentoo Linux
Debian 6.0.10
Oracle Linux Server release 7.1
Rely on regex to find the version number.
Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rwxr-xr-x | scripts/ver_linux | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index 31c0e4d09ffc..1fea7494a1b1 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -25,7 +25,12 @@ awk '/GNU Make/{ substr($0,RSTART,RLENGTH)) }' -echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')" +ld -v 2>&1 | +awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Binutils\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' echo -n "util-linux " fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$// |