Skip to content

Commit

Permalink
kbuild: ver_linux fix glibc version print
Browse files Browse the repository at this point in the history
Fix ver_linux glibc version printing (for real this time)

Alexey Dobriyan reported that commit
4a645d5
broke ver_linux when glibc has a 3 digit
version number, and proposed a patch.
Al Viro then suggested a simpler way to
solve the problem which I've then simply
put into patch form.

Signed-off-by: Alexey Dobriyan <[email protected]>
Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Jesper Juhl <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
  • Loading branch information
Jesper Juhl authored and Sam Ravnborg committed Oct 12, 2007
1 parent de47062 commit 9cc3ef3
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions scripts/ver_linux
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ isdnctrl 2>&1 | grep version | awk \
showmount --version 2>&1 | grep nfs-utils | awk \
'NR==1{print "nfs-utils ", $NF}'

ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed \
-e 's/\.so$//' | sed -e 's/>//' | \
awk -F'[.-]' '{print "Linux C Library "$(NF-1)"."$NF}'
echo -n "Linux C Library "
sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps

ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \
'NR==1{print "Dynamic linker (ldd) ", $NF}'
Expand Down

0 comments on commit 9cc3ef3

Please sign in to comment.