summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2005-09-06 15:17:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:33 -0700
commit580b2e3c0183818adf6151e60270405b02ea8504 (patch)
tree596286b22842dd8ab62b5837debab5dc2caea14d /scripts
parente752dd6cc66a3e6a11396928998baf390cc00420 (diff)
downloadlinux-580b2e3c0183818adf6151e60270405b02ea8504.tar.gz
linux-580b2e3c0183818adf6151e60270405b02ea8504.tar.bz2
linux-580b2e3c0183818adf6151e60270405b02ea8504.zip
[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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ver_linux6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index a28c279c49dd..beb43ef7f761 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -25,9 +25,11 @@ ld -v | awk -F\) '{print $1}' | awk \
'/BFD/{print "binutils ",$NF} \
/^GNU/{print "binutils ",$4}'
-fdformat --version | awk -F\- '{print "util-linux ", $NF}'
+echo -n "util-linux "
+fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
-mount --version | awk -F\- '{print "mount ", $NF}'
+echo -n "mount "
+mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'