From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 6 Sep 2005 22:17:43 +0000 (-0700)
Subject: [PATCH] Adapt scripts/ver_linux to new util-linux version strings
X-Git-Tag: v2.6.14-rc1~668
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=580b2e3c0183818adf6151e60270405b02ea8504;p=linux-2.6

[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>
---

diff --git a/scripts/ver_linux b/scripts/ver_linux
index a28c279c49..beb43ef7f7 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}'