Re: [RFC] Kernel naming convention in the merge phase

From: Pavel Machek
Date: Wed May 21 2008 - 07:17:03 EST


On Wed 2008-04-30 16:47:24, H. Peter Anvin wrote:
> Oliver Hartkopp wrote:
> >Hi all,
> >
> >i wonder about the Kernel naming convention in the
> >merge phase before
> >the -rc1 is officially tagged by Linus.
> >
> >Won't it be more precisely to name the current snapshot
> >2.6.26-merge-git16 instead of 2.6.25-git16?
> >
> >It is not that i would suggest to have a new git tag in
> >this merge phase but only the Makefile should be
> >changed at the beginning of this phase to identify the
> >ongoing work for the 2.6.26:
> >
> >------
> >diff --git a/Makefile b/Makefile
> >index d3634cd..b8c85a4 100644
> >--- a/Makefile
> >+++ b/Makefile
> >@@ -1,8 +1,8 @@
> >VERSION = 2
> >PATCHLEVEL = 6
> >-SUBLEVEL = 25
> >-EXTRAVERSION =
> >-NAME = Funky Weasel is Jiggy wit it
> >+SUBLEVEL = 26
> >+EXTRAVERSION = -merge
> >+NAME = unnamed
> >
> ># *DOCUMENTATION*
> ># To see a list of typical targets execute "make help"
> >------
> >
> >Introducing the new '-merge' version _that_ early helps
> >to avoid the version confusion in /lib/modules and also
> >allows people to work with kernel version depended
> >stuff in a very early phase.
> >
>
> And it'll break all the robotic stuff again.
>
> Foo-gitX has always been a development snapshot which
> *follows* Foo.

Well, unfortunately its not there in the makefile, so you can't tell
2.6.25 from 2.6.26-rc0...

Would 'rc0' make robots happy?
Pavel

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/