Commit 656a3f797889dafcce2f5b8b222ad66e9974b6f7

Authored by Gabriel C
Committed by Sam Ravnborg
1 parent eb90d81d03

scripts/ver_linux use 'gcc -dumpversion'

These magic greps and hacks in ver_linux to get the gcc version always break after some gcc releases.

Since now gcc >4.3 allows compiling with '--with-pkgversion' ( which can be everything 'My Cool Gcc' or something )
ver_linux will report random junk for these.

Simply use 'gcc -dumpversion' to get the gcc version which should always work.

Signed-off-by: Gabriel C <nix.or.die@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Showing 1 changed file with 1 additions and 4 deletions Inline Diff

1 #!/bin/sh 1 #!/bin/sh
2 # Before running this script please ensure that your PATH is 2 # Before running this script please ensure that your PATH is
3 # typical as you use for compilation/istallation. I use 3 # typical as you use for compilation/istallation. I use
4 # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may 4 # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may
5 # differ on your system. 5 # differ on your system.
6 # 6 #
7 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:$PATH 7 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:$PATH
8 echo 'If some fields are empty or look unusual you may have an old version.' 8 echo 'If some fields are empty or look unusual you may have an old version.'
9 echo 'Compare to the current minimal requirements in Documentation/Changes.' 9 echo 'Compare to the current minimal requirements in Documentation/Changes.'
10 echo ' ' 10 echo ' '
11 11
12 uname -a 12 uname -a
13 echo ' ' 13 echo ' '
14 14
15 gcc --version 2>&1| head -n 1 | grep -v gcc | awk \ 15 gcc -dumpversion 2>&1| awk \
16 'NR==1{print "Gnu C ", $1}' 16 'NR==1{print "Gnu C ", $1}'
17
18 gcc --version 2>&1| grep gcc | awk \
19 'NR==1{print "Gnu C ", $3}'
20 17
21 make --version 2>&1 | awk -F, '{print $1}' | awk \ 18 make --version 2>&1 | awk -F, '{print $1}' | awk \
22 '/GNU Make/{print "Gnu make ",$NF}' 19 '/GNU Make/{print "Gnu make ",$NF}'
23 20
24 echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')" 21 echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
25 22
26 echo -n "util-linux " 23 echo -n "util-linux "
27 fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$// 24 fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
28 25
29 echo -n "mount " 26 echo -n "mount "
30 mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$// 27 mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
31 28
32 depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}' 29 depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
33 30
34 tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ 31 tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \
35 'NR==1 {print "e2fsprogs ", $2}' 32 'NR==1 {print "e2fsprogs ", $2}'
36 33
37 fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ 34 fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \
38 'NR==1 {print "jfsutils ", $3}' 35 'NR==1 {print "jfsutils ", $3}'
39 36
40 reiserfsck -V 2>&1 | grep ^reiserfsck | awk \ 37 reiserfsck -V 2>&1 | grep ^reiserfsck | awk \
41 'NR==1{print "reiserfsprogs ", $2}' 38 'NR==1{print "reiserfsprogs ", $2}'
42 39
43 fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \ 40 fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
44 'NR==1{print "reiser4progs ", $2}' 41 'NR==1{print "reiser4progs ", $2}'
45 42
46 xfs_db -V 2>&1 | grep version | awk \ 43 xfs_db -V 2>&1 | grep version | awk \
47 'NR==1{print "xfsprogs ", $3}' 44 'NR==1{print "xfsprogs ", $3}'
48 45
49 pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils ", $2}' 46 pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils ", $2}'
50 47
51 cardmgr -V 2>&1| grep version | awk \ 48 cardmgr -V 2>&1| grep version | awk \
52 'NR==1{print "pcmcia-cs ", $3}' 49 'NR==1{print "pcmcia-cs ", $3}'
53 50
54 quota -V 2>&1 | grep version | awk \ 51 quota -V 2>&1 | grep version | awk \
55 'NR==1{print "quota-tools ", $NF}' 52 'NR==1{print "quota-tools ", $NF}'
56 53
57 pppd --version 2>&1| grep version | awk \ 54 pppd --version 2>&1| grep version | awk \
58 'NR==1{print "PPP ", $3}' 55 'NR==1{print "PPP ", $3}'
59 56
60 isdnctrl 2>&1 | grep version | awk \ 57 isdnctrl 2>&1 | grep version | awk \
61 'NR==1{print "isdn4k-utils ", $NF}' 58 'NR==1{print "isdn4k-utils ", $NF}'
62 59
63 showmount --version 2>&1 | grep nfs-utils | awk \ 60 showmount --version 2>&1 | grep nfs-utils | awk \
64 'NR==1{print "nfs-utils ", $NF}' 61 'NR==1{print "nfs-utils ", $NF}'
65 62
66 echo -n "Linux C Library " 63 echo -n "Linux C Library "
67 sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps 64 sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps
68 65
69 ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \ 66 ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \
70 'NR==1{print "Dynamic linker (ldd) ", $NF}' 67 'NR==1{print "Dynamic linker (ldd) ", $NF}'
71 68
72 ls -l /usr/lib/lib{g,stdc}++.so 2>/dev/null | awk -F. \ 69 ls -l /usr/lib/lib{g,stdc}++.so 2>/dev/null | awk -F. \
73 '{print "Linux C++ Library " $4"."$5"."$6}' 70 '{print "Linux C++ Library " $4"."$5"."$6}'
74 71
75 ps --version 2>&1 | grep version | awk \ 72 ps --version 2>&1 | grep version | awk \
76 'NR==1{print "Procps ", $NF}' 73 'NR==1{print "Procps ", $NF}'
77 74
78 ifconfig --version 2>&1 | grep tools | awk \ 75 ifconfig --version 2>&1 | grep tools | awk \
79 'NR==1{print "Net-tools ", $NF}' 76 'NR==1{print "Net-tools ", $NF}'
80 77
81 # Kbd needs 'loadkeys -h', 78 # Kbd needs 'loadkeys -h',
82 loadkeys -h 2>&1 | awk \ 79 loadkeys -h 2>&1 | awk \
83 '(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}' 80 '(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}'
84 81
85 # while console-tools needs 'loadkeys -V'. 82 # while console-tools needs 'loadkeys -V'.
86 loadkeys -V 2>&1 | awk \ 83 loadkeys -V 2>&1 | awk \
87 '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}' 84 '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}'
88 85
89 oprofiled --version 2>&1 | awk \ 86 oprofiled --version 2>&1 | awk \
90 '(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}' 87 '(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}'
91 88
92 expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}' 89 expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}'
93 90
94 udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}' 91 udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}'
95 92
96 iwconfig --version 2>&1 | awk \ 93 iwconfig --version 2>&1 | awk \
97 '(NR==1 && ($3 == "version")) {print "wireless-tools ",$4}' 94 '(NR==1 && ($3 == "version")) {print "wireless-tools ",$4}'
98 95
99 if [ -e /proc/modules ]; then 96 if [ -e /proc/modules ]; then
100 X=`cat /proc/modules | sed -e "s/ .*$//"` 97 X=`cat /proc/modules | sed -e "s/ .*$//"`
101 echo "Modules Loaded "$X 98 echo "Modules Loaded "$X
102 fi 99 fi
103 100