remove the `.' in EXTRAVERSION usage

PATCH In review Coywolf Qi Hunt 3 participants 4 messages Mar 5, 2005 Kbuild

Share & tools

Coywolf Qi Hunt

author

2005-03-05 10:22 UTC #0 lore raw

PATCH 1/1 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]>

Makefile +0 -0

diff -Nrup 2.6.11/Makefile 2.6.11-cy/Makefile
@@ -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

Signature · 2 lines

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

Willy Tarreau

2005-03-05 10:41 UTC #1 lore raw

Quoted 20 lines · Coywolf Qi Hunt

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
Makefile +0 -0
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 11
Makefile +1 -1
-EXTRAVERSION =
+EXTRAVERSION = 1
NAME=Woozy Numbat
# *DOCUMENTATION*

Makefile LOCALVERSION = $(subst $(space),, \ · line 161

Quoted 5 lines

Makefile +1 -1

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

Alexey Dobriyan

2005-03-05 10:47 UTC #2 lore raw

In reply to Coywolf Qi Hunt

Review

Quoted 7 lines · Coywolf Qi Hunt

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.
(quoted diff) +1 -1
-KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
+KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)$(LOCALVERSION)

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

Alexey

Coywolf Qi Hunt

author

2005-03-05 11:09 UTC #3 lore raw

Quoted 7 lines · Alexey Dobriyan

Quoted 4 lines · Coywolf Qi Hunt
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.

Quoted 7 lines

Review
Quoted 2 lines
(quoted diff) +1 -1
-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.
.-)

Signature · 2 lines

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