Commit 9cc3ef30 authored Aug 22, 2007 by Jesper Juhl Committed by Sam Ravnborg Oct 12, 2007

kbuild: ver_linux fix glibc version print



Fix ver_linux glibc version printing (for real this time)

Alexey Dobriyan reported that commit
4a645d5e
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>

parent de47062a

scripts/ver_linux

+2 −3

Original line number	Diff line number	Diff line
		@@ -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}'

Admin message