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 Side-by-side Diff

... ... @@ -25,9 +25,11 @@
25 25 '/BFD/{print "binutils ",$NF} \
26 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 34 depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
33 35