diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-08-21 21:11:56 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-12 15:15:31 -0400 |
| commit | 9cc3ef30346da96f3dd7f2e328e8a5ff46a37fd9 (patch) | |
| tree | ec2017c6453a70bb5b1635aef5a4f080c60d4fd8 | |
| parent | de47062a17a236543690e0c23dfb30cb11c6e674 (diff) | |
kbuild: ver_linux fix glibc version print
Fix ver_linux glibc version printing (for real this time)
Alexey Dobriyan reported that commit
4a645d5ea65baaa5736bcb566673bf4a351b2ad8
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 <adobriyan@sw.ru>
Signed-off-by: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rwxr-xr-x | scripts/ver_linux | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index 8f8df93141a..5a16bad7259 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
| @@ -65,9 +65,8 @@ isdnctrl 2>&1 | grep version | awk \ | |||
| 65 | showmount --version 2>&1 | grep nfs-utils | awk \ | 65 | showmount --version 2>&1 | grep nfs-utils | awk \ |
| 66 | 'NR==1{print "nfs-utils ", $NF}' | 66 | 'NR==1{print "nfs-utils ", $NF}' |
| 67 | 67 | ||
| 68 | ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed \ | 68 | echo -n "Linux C Library " |
| 69 | -e 's/\.so$//' | sed -e 's/>//' | \ | 69 | sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps |
| 70 | awk -F'[.-]' '{print "Linux C Library "$(NF-1)"."$NF}' | ||
| 71 | 70 | ||
| 72 | ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \ | 71 | ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \ |
| 73 | 'NR==1{print "Dynamic linker (ldd) ", $NF}' | 72 | 'NR==1{print "Dynamic linker (ldd) ", $NF}' |