diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-08-22 03:11:56 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-12 21:15:31 +0200 |
| commit | 9cc3ef30346da96f3dd7f2e328e8a5ff46a37fd9 (patch) | |
| tree | ec2017c6453a70bb5b1635aef5a4f080c60d4fd8 /scripts | |
| parent | de47062a17a236543690e0c23dfb30cb11c6e674 (diff) | |
| download | linux-9cc3ef30346da96f3dd7f2e328e8a5ff46a37fd9.tar.gz linux-9cc3ef30346da96f3dd7f2e328e8a5ff46a37fd9.tar.bz2 linux-9cc3ef30346da96f3dd7f2e328e8a5ff46a37fd9.zip | |
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>
Diffstat (limited to 'scripts')
| -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 8f8df93141a9..5a16bad72595 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -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}' |