Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc9eefdb authored by Jesper Juhl's avatar Jesper Juhl Committed by Sam Ravnborg
Browse files

kbuild: scripts/ver_linux : correct printing of binutils version



Currently scripts/ver_linux prints "Binutils" or other random
information for the version number in the "binutils" output line
on some distributions. This patch corrects that.

When I initially submitted a patch to correct that, I was not aware
that the output from "ld -v" could differ as much as it turned out
it can, so my original fix turned out to not cover all bases.
This patch works correctly with all the different "ld -v" output
that people posted in replys to my first patch, so it should be a
clear win over what we have currently.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 9cc3ef30
Loading
Loading
Loading
Loading
+1 −3
Original line number Original line Diff line number Diff line
@@ -21,9 +21,7 @@ gcc --version 2>&1| grep gcc | awk \
make --version 2>&1 | awk -F, '{print $1}' | awk \
make --version 2>&1 | awk -F, '{print $1}' | awk \
      '/GNU Make/{print "Gnu make              ",$NF}'
      '/GNU Make/{print "Gnu make              ",$NF}'


ld -v | awk -F\) '{print $1}' | awk \
echo "binutils               $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
'/BFD/{print "binutils              ",$NF} \
/^GNU/{print "binutils              ",$4}'


echo -n "util-linux             "
echo -n "util-linux             "
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//