2005-03-05 10:22:48

by Coywolf Qi Hunt

Subject: [patch] remove the `.' in EXTRAVERSION usage

Since 2.6.9, there came along the LOCALVERSION for people to add local
version in make menuconfig which was EXTRAVERSION originally for imho.
Now EXTRAVERSION goes just as a kernel version number, it's reasonable
to remove the `.' in its usage.

Signed-off-by: Coywolf Qi Hunt <[email protected]>

diff -Nrup 2.6.11/Makefile 2.6.11-cy/Makefile
--- 2.6.11/Makefile 2005-03-03 17:10:57.000000000 +0800
+++ 2.6.11-cy/Makefile 2005-03-05 16:40:46.000000000 +0800
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 11
-EXTRAVERSION =
+EXTRAVERSION = 1
NAME=Woozy Numbat

# *DOCUMENTATION*
@@ -158,7 +158,7 @@ LOCALVERSION = $(subst $(space),, \
$(shell cat /dev/null $(localver)) \
$(patsubst "%",%,$(CONFIG_LOCALVERSION)))

-KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
+KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)$(LOCALVERSION)

# SUBARCH tells the usermode build what the underlying arch is. That is set
# first, and if a usermode build is happening, the "ARCH=um" on the command
--
Coywolf Qi Hunt
Homepage http://sosdg.org/~coywolf/

2005-03-05 10:41:24

by Willy Tarreau

Subject: Re: [patch] remove the `.' in EXTRAVERSION usage

On Sat, Mar 05, 2005 at 06:22:45PM +0800, Coywolf Qi Hunt wrote:
> Since 2.6.9, there came along the LOCALVERSION for people to add local
> version in make menuconfig which was EXTRAVERSION originally for imho.
> Now EXTRAVERSION goes just as a kernel version number, it's reasonable
> to remove the `.' in its usage.
>
> Signed-off-by: Coywolf Qi Hunt <[email protected]>
>
> diff -Nrup 2.6.11/Makefile 2.6.11-cy/Makefile
> --- 2.6.11/Makefile 2005-03-03 17:10:57.000000000 +0800
> +++ 2.6.11-cy/Makefile 2005-03-05 16:40:46.000000000 +0800
> @@ -1,7 +1,7 @@
> VERSION = 2
> PATCHLEVEL = 6
> SUBLEVEL = 11
> -EXTRAVERSION =
> +EXTRAVERSION = 1
> NAME=Woozy Numbat
>
> # *DOCUMENTATION*
> @@ -158,7 +158,7 @@ LOCALVERSION = $(subst $(space),, \
> $(shell cat /dev/null $(localver)) \
> $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
>
> -KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
> +KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)$(LOCALVERSION)

Please don't do that, you'll always end up with a trailing dot in 3-numbers
versions. Eg: V=2 P=6 S=11 => "2.6.11."

Willy

2005-03-05 10:47:07

by Alexey Dobriyan

Subject: Re: [patch] remove the `.' in EXTRAVERSION usage

On Saturday 05 March 2005 12:22, Coywolf Qi Hunt wrote:

> Since 2.6.9, there came along the LOCALVERSION for people to add local
> version in make menuconfig which was EXTRAVERSION originally for imho.
> Now EXTRAVERSION goes just as a kernel version number, it's reasonable
> to remove the `.' in its usage.

> -KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
> +KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)$(LOCALVERSION)

You want 2.6.11.-mm2 or 2.6.11.mm2 ? :-)

Alexey

2005-03-05 11:09:43

by Coywolf Qi Hunt

Subject: Re: [patch] remove the `.' in EXTRAVERSION usage

On Sat, 5 Mar 2005 13:47:08 +0200, Alexey Dobriyan <[email protected]> wrote:
> On Saturday 05 March 2005 12:22, Coywolf Qi Hunt wrote:
>
> > Since 2.6.9, there came along the LOCALVERSION for people to add local
> > version in make menuconfig which was EXTRAVERSION originally for imho.
> > Now EXTRAVERSION goes just as a kernel version number, it's reasonable
> > to remove the `.' in its usage.
>
> > -KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
> > +KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)$(LOCALVERSION)
>
> You want 2.6.11.-mm2 or 2.6.11.mm2 ? :-)
>
> Alexey
>

True. My fault, EXTRAVERSION isn't always present and isn't even
always a number.
Thanks all.
.-)

--
Coywolf Qi Hunt
Homepage http://sosdg.org/~coywolf/