Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 580b2e3c0183818adf6151e60270405b02ea8504

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent e752dd6cc6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] Adapt scripts/ver_linux to new util-linux version strings 

Tested with 2.12i and 2.13-pre2.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 4 additions and 2 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 --version 2>&1| head -n 1 | grep -v gcc | awk \
16 'NR==1{print "Gnu C ", $1}' 16 'NR==1{print "Gnu C ", $1}'
17 17
18 gcc --version 2>&1| grep gcc | awk \ 18 gcc --version 2>&1| grep gcc | awk \
19 'NR==1{print "Gnu C ", $3}' 19 'NR==1{print "Gnu C ", $3}'
20 20
21 make --version 2>&1 | awk -F, '{print $1}' | awk \ 21 make --version 2>&1 | awk -F, '{print $1}' | awk \
22 '/GNU Make/{print "Gnu make ",$NF}' 22 '/GNU Make/{print "Gnu make ",$NF}'
23 23
24 ld -v | awk -F\) '{print $1}' | awk \ 24 ld -v | awk -F\) '{print $1}' | awk \
25 '/BFD/{print "binutils ",$NF} \ 25 '/BFD/{print "binutils ",$NF} \
26 /^GNU/{print "binutils ",$4}' 26 /^GNU/{print "binutils ",$4}'
27 27
28 fdformat --version | awk -F\- '{print "util-linux ", $NF}' 28 echo -n "util-linux "
29 fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
29 30
30 mount --version | awk -F\- '{print "mount ", $NF}' 31 echo -n "mount "
32 mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
31 33
32 depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}' 34 depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
33 35
34 tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ 36 tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \
35 'NR==1 {print "e2fsprogs ", $2}' 37 'NR==1 {print "e2fsprogs ", $2}'
36 38
37 fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ 39 fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \
38 'NR==1 {print "jfsutils ", $3}' 40 'NR==1 {print "jfsutils ", $3}'
39 41
40 reiserfsck -V 2>&1 | grep reiserfsck | awk \ 42 reiserfsck -V 2>&1 | grep reiserfsck | awk \
41 'NR==1{print "reiserfsprogs ", $2}' 43 'NR==1{print "reiserfsprogs ", $2}'
42 44
43 fsck.reiser4 -V 2>&1 | grep fsck.reiser4 | awk \ 45 fsck.reiser4 -V 2>&1 | grep fsck.reiser4 | awk \
44 'NR==1{print "reiser4progs ", $2}' 46 'NR==1{print "reiser4progs ", $2}'
45 47
46 xfs_db -V 2>&1 | grep version | awk \ 48 xfs_db -V 2>&1 | grep version | awk \
47 'NR==1{print "xfsprogs ", $3}' 49 'NR==1{print "xfsprogs ", $3}'
48 50
49 cardmgr -V 2>&1| grep version | awk \ 51 cardmgr -V 2>&1| grep version | awk \
50 'NR==1{print "pcmcia-cs ", $3}' 52 'NR==1{print "pcmcia-cs ", $3}'
51 53
52 quota -V 2>&1 | grep version | awk \ 54 quota -V 2>&1 | grep version | awk \
53 'NR==1{print "quota-tools ", $NF}' 55 'NR==1{print "quota-tools ", $NF}'
54 56
55 pppd --version 2>&1| grep version | awk \ 57 pppd --version 2>&1| grep version | awk \
56 'NR==1{print "PPP ", $3}' 58 'NR==1{print "PPP ", $3}'
57 59
58 isdnctrl 2>&1 | grep version | awk \ 60 isdnctrl 2>&1 | grep version | awk \
59 'NR==1{print "isdn4k-utils ", $NF}' 61 'NR==1{print "isdn4k-utils ", $NF}'
60 62
61 showmount --version 2>&1 | grep nfs-utils | awk \ 63 showmount --version 2>&1 | grep nfs-utils | awk \
62 'NR==1{print "nfs-utils ", $NF}' 64 'NR==1{print "nfs-utils ", $NF}'
63 65
64 ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed \ 66 ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed \
65 -e 's/\.so$//' | awk -F'[.-]' '{print "Linux C Library " \ 67 -e 's/\.so$//' | awk -F'[.-]' '{print "Linux C Library " \
66 $(NF-2)"."$(NF-1)"."$NF}' 68 $(NF-2)"."$(NF-1)"."$NF}'
67 69
68 ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \ 70 ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \
69 'NR==1{print "Dynamic linker (ldd) ", $NF}' 71 'NR==1{print "Dynamic linker (ldd) ", $NF}'
70 72
71 ls -l /usr/lib/lib{g,stdc}++.so 2>/dev/null | awk -F. \ 73 ls -l /usr/lib/lib{g,stdc}++.so 2>/dev/null | awk -F. \
72 '{print "Linux C++ Library " $4"."$5"."$6}' 74 '{print "Linux C++ Library " $4"."$5"."$6}'
73 75
74 ps --version 2>&1 | grep version | awk \ 76 ps --version 2>&1 | grep version | awk \
75 'NR==1{print "Procps ", $NF}' 77 'NR==1{print "Procps ", $NF}'
76 78
77 ifconfig --version 2>&1 | grep tools | awk \ 79 ifconfig --version 2>&1 | grep tools | awk \
78 'NR==1{print "Net-tools ", $NF}' 80 'NR==1{print "Net-tools ", $NF}'
79 81
80 # Kbd needs 'loadkeys -h', 82 # Kbd needs 'loadkeys -h',
81 loadkeys -h 2>&1 | awk \ 83 loadkeys -h 2>&1 | awk \
82 '(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}' 84 '(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}'
83 85
84 # while console-tools needs 'loadkeys -V'. 86 # while console-tools needs 'loadkeys -V'.
85 loadkeys -V 2>&1 | awk \ 87 loadkeys -V 2>&1 | awk \
86 '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}' 88 '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}'
87 89
88 expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}' 90 expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}'
89 91
90 udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}' 92 udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}'
91 93
92 if [ -e /proc/modules ]; then 94 if [ -e /proc/modules ]; then
93 X=`cat /proc/modules | sed -e "s/ .*$//"` 95 X=`cat /proc/modules | sed -e "s/ .*$//"`
94 echo "Modules Loaded "$X 96 echo "Modules Loaded "$X
95 fi 97 fi
96 98