[PATCH] SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION

[PATCH] SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION

[Boaz Harrosh]

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)

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
 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
-- 
1.6.6.1

Re: [PATCH] SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION

[Boaz Harrosh]

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 <bharrosh@panasas.com>
> ---
>  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

Re: [PATCH] SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION

[Benny Halevy]

Merged at pnfs-all-2.6.35-rc3-2010-06-14

Thanks!

Benny

On Jun. 08, 2010, 4:47 -0400, Boaz Harrosh <bharrosh@panasas.com> 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)
> 
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
> ---
>  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