[2.6 patch] adapt scripts/ver_linux to new util-linux version strings

[2.6 patch] adapt scripts/ver_linux to new util-linux version strings

[Adrian Bunk]

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.13-rc6-mm1-full/scripts/ver_linux.old	2005-08-20 05:54:50.000000000 +0200
+++ linux-2.6.13-rc6-mm1-full/scripts/ver_linux	2005-08-20 05:55:36.000000000 +0200
@@ -25,9 +25,11 @@
 '/BFD/{print "binutils              ",$NF} \
 /^GNU/{print "binutils              ",$4}'
 
-fdformat --version | awk -F\- '{print "util-linux            ", $NF}'
+fdformat --version | awk '{print "util-linux            ", $NF}' \
+| awk -F\) '{print $1}'
 
-mount --version | awk -F\- '{print "mount                 ", $NF}'
+mount --version | awk '{print "mount                 ", $NF}' | \
+awk -F\) '{print $1}'
 
 depmod -V  2>&1 | awk 'NR==1 {print "module-init-tools     ",$NF}'
 

Re: [2.6 patch] adapt scripts/ver_linux to new util-linux version strings

[Alexey Dobriyan]

On Sat, Aug 20, 2005 at 05:58:53AM +0200, Adrian Bunk wrote:
> --- linux-2.6.13-rc6-mm1-full/scripts/ver_linux.old
> +++ linux-2.6.13-rc6-mm1-full/scripts/ver_linux

> -fdformat --version | awk -F\- '{print "util-linux            ", $NF}'
> +fdformat --version | awk '{print "util-linux            ", $NF}' \
> +| awk -F\) '{print $1}'
>  
> -mount --version | awk -F\- '{print "mount                 ", $NF}'
> +mount --version | awk '{print "mount                 ", $NF}' | \
> +awk -F\) '{print $1}'

-util-linux             2.12i
-mount                  2.12i
+util-linux             util-linux-2.12i
+mount                  mount-2.12i
			^^^^^^

Is this intentional?

Re: [2.6 patch] adapt scripts/ver_linux to new util-linux version strings

[Adrian Bunk]

On Sat, Aug 20, 2005 at 09:55:32AM +0400, Alexey Dobriyan wrote:
> On Sat, Aug 20, 2005 at 05:58:53AM +0200, Adrian Bunk wrote:
> > --- linux-2.6.13-rc6-mm1-full/scripts/ver_linux.old
> > +++ linux-2.6.13-rc6-mm1-full/scripts/ver_linux
> 
> > -fdformat --version | awk -F\- '{print "util-linux            ", $NF}'
> > +fdformat --version | awk '{print "util-linux            ", $NF}' \
> > +| awk -F\) '{print $1}'
> >  
> > -mount --version | awk -F\- '{print "mount                 ", $NF}'
> > +mount --version | awk '{print "mount                 ", $NF}' | \
> > +awk -F\) '{print $1}'
> 
> -util-linux             2.12i
> -mount                  2.12i
> +util-linux             util-linux-2.12i
> +mount                  mount-2.12i
> 			^^^^^^
> 
> Is this intentional?

After this patch, the new format is parsed correctly instead of 
completely wrong.

You've found the small regression parsing the old format.

IMHO this is not a problem. If you disagree, feel free to send a better 
patch.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

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

[Alexey Dobriyan]

Tested with 2.12i and 2.13-pre2.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 scripts/ver_linux |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- linux-vanilla/scripts/ver_linux
+++ linux-util-linux/scripts/ver_linux
@@ -25,9 +25,11 @@
 '/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}'
 

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

[Adrian Bunk]

On Sun, Aug 21, 2005 at 01:26:06PM +0400, Alexey Dobriyan wrote:

> Tested with 2.12i and 2.13-pre2.
>...

Looks good.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed