diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:41:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:41:02 -0400 |
commit | 2514395ef88b46e895726a8d40966cb83de7940c (patch) | |
tree | 216c6e194e81bdd9c97697cf162cc9505bde310a /scripts/ver_linux | |
parent | b3967dc566bc89df19e9aeb87b2fd483418b02e6 (diff) | |
parent | b5ac4817de3032796c558b0a32062e7392b5ea60 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kconfig: fix typo in change count initialization
kconfig: recenter menuconfig
kconfig: revert conf behaviour change
kconfig: fix default value for choice input
kbuild: fix NULL dereference in scripts/mod/modpost.c
kbuild: fix mode of checkstack.pl and other files.
kbuild: rebuild initramfs if content of initramfs changes
kbuild: properly pass options to hostcc when doing make O=..
kbuild: modules_install for external modules must not remove existing modules
kbuild: fix make dir/
ver_linux: don't print reiser4progs version if none found
kbuild: mips: fix sed regexp to generate asm-offset.h
kbuild: fix building single targets with make O=.. single-target
kbuild: use relative path to -I
kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree
kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree
kbuild: fix garbled text in modules.txt
Diffstat (limited to 'scripts/ver_linux')
-rwxr-xr-x | scripts/ver_linux | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index beb43ef7f761..84999f69773d 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
@@ -39,10 +39,10 @@ tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ | |||
39 | fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ | 39 | fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ |
40 | 'NR==1 {print "jfsutils ", $3}' | 40 | 'NR==1 {print "jfsutils ", $3}' |
41 | 41 | ||
42 | reiserfsck -V 2>&1 | grep reiserfsck | awk \ | 42 | reiserfsck -V 2>&1 | grep ^reiserfsck | awk \ |
43 | 'NR==1{print "reiserfsprogs ", $2}' | 43 | 'NR==1{print "reiserfsprogs ", $2}' |
44 | 44 | ||
45 | fsck.reiser4 -V 2>&1 | grep fsck.reiser4 | awk \ | 45 | fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \ |
46 | 'NR==1{print "reiser4progs ", $2}' | 46 | 'NR==1{print "reiser4progs ", $2}' |
47 | 47 | ||
48 | xfs_db -V 2>&1 | grep version | awk \ | 48 | xfs_db -V 2>&1 | grep version | awk \ |