From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from daytona.panasas.com ([67.152.220.89]:40923 "EHLO daytona.int.panasas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751035Ab0FHK2U (ORCPT ); Tue, 8 Jun 2010 06:28:20 -0400 Message-ID: <4C0E1B42.7050703@panasas.com> Date: Tue, 08 Jun 2010 13:28:18 +0300 From: Boaz Harrosh To: Benny Halevy , NFS list Subject: Re: [PATCH] SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION References: <4C0E0387.8070502@panasas.com> In-Reply-To: <4C0E0387.8070502@panasas.com> Content-Type: text/plain; charset=UTF-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 On 06/08/2010 11:47 AM, Boaz Harrosh wrote: > > The official way of adding a tree identifier tag to the Kernel > version-string is a presence of a localversion-* file next to > the Makefile. It's content is appended to the Linus supplied > version-string from Makefile. > > After this patch the output is the same as before xxx-2.6.35-rc2-pnfs > But is a more comfortable way to manage it. > > (The appended "+" in post 2.6.35-rc Kernels is not resolved with > this. But I have sent a patch to Linus to fix this issue) > OK That one is as follows: If Benny will tag the branches tips (As he does today) with a $ git tag -a foo-xxxx (The difference is the "-a" option. He might also want to add the -m tage_name as well) Then together with this patch the compilation will be "+" less. As soon as any one has any changes apart from Benny's tag-a he will get a "+" appended to his Kernel Boaz > Signed-off-by: Boaz Harrosh > --- > Makefile | 2 +- > localversion-pnfs | 1 + > 2 files changed, 2 insertions(+), 1 deletions(-) > create mode 100644 localversion-pnfs > > diff --git a/Makefile b/Makefile > index 6ac434c..654c31a 100644 > --- a/Makefile > +++ b/Makefile > @@ -1,7 +1,7 @@ > VERSION = 2 > PATCHLEVEL = 6 > SUBLEVEL = 35 > -EXTRAVERSION = -rc2-pnfs > +EXTRAVERSION = -rc2 > NAME = Sheep on Meth > > # *DOCUMENTATION* > diff --git a/localversion-pnfs b/localversion-pnfs > new file mode 100644 > index 0000000..7523328 > --- /dev/null > +++ b/localversion-pnfs > @@ -0,0 +1 @@ > +-pnfs