diff options
author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 14:39:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 00:55:26 -0400 |
commit | 3e2f5cfb38dbd7d0c4a9cfd5093bea4b027a9d6d (patch) | |
tree | d5b7c58a1e17efec722bb059068357bb8e48f2cb | |
parent | 1d60b873aecc6fce4893b76500c30374f8c9e394 (diff) |
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/{ | |||
25 | substr($0,RSTART,RLENGTH)) | 25 | substr($0,RSTART,RLENGTH)) |
26 | }' | 26 | }' |
27 | 27 | ||
28 | echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')" | 28 | ld -v 2>&1 | |
29 | awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ | ||
30 | match($0, /[0-9]+([.]?[0-9]+)+/) | ||
31 | printf("Binutils\t\t%s\n", | ||
32 | substr($0,RSTART,RLENGTH)) | ||
33 | }' | ||
29 | 34 | ||
30 | echo -n "util-linux " | 35 | echo -n "util-linux " |
31 | fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$// | 36 | fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$// |