X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fver_linux;h=7ac0e309be0985386c3196958859a1381fb02735;hb=64e83b5a919a65eb35b63dd7e07c188379ff8ce6;hp=72876dfadc8ae9fd6125737910cd8555ae8d17f1;hpb=7f3af60e5a444b287d740a84998a8f480645dadf;p=linux-2.6-omap-h63xx.git diff --git a/scripts/ver_linux b/scripts/ver_linux index 72876dfadc8..7ac0e309be0 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -12,18 +12,13 @@ echo ' ' uname -a echo ' ' -gcc --version 2>&1| head -n 1 | grep -v gcc | awk \ +gcc -dumpversion 2>&1| awk \ 'NR==1{print "Gnu C ", $1}' -gcc --version 2>&1| grep gcc | awk \ -'NR==1{print "Gnu C ", $3}' - make --version 2>&1 | awk -F, '{print $1}' | awk \ '/GNU Make/{print "Gnu make ",$NF}' -ld -v | awk -F\) '{print $1}' | awk \ -'/BFD/{print "binutils ",$NF} \ -/^GNU/{print "binutils ",$4}' +echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')" echo -n "util-linux " fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$// @@ -65,9 +60,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$//' | awk -F'[.-]' '{print "Linux C Library " \ -$(NF-2)"."$(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}'