On Wed, Aug 22, 2007 at 03:11:56AM +0200, Jesper Juhl wrote:
>
> 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 <[EMAIL PROTECTED]>
> Signed-off-by: Al Viro <[EMAIL PROTECTED]>
> Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>
> ---
>
> scripts/ver_linux | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/ver_linux b/scripts/ver_linux
> index 8f8df93..5a16bad 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}'
>
Applied.
Sam
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
