Skip to contentSkip to conversation

SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION

PATCH In review Boaz Harrosh 2 participants 3 messages Jun 8, 2010 – Jun 15, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SQUASHME: DEVONLY: pnfs: Add -pnfs suffix to EXTRAVERSION

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)

---
 Makefile          |    2 +-
 localversion-pnfs |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
 create mode 100644 localversion-pnfs
Makefile +1 -1
index 6ac434c..654c31a 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 35
-EXTRAVERSION = -rc2-pnfs
+EXTRAVERSION = -rc2
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*
localversion-pnfs new file +1 -0
new file mode 100644
index 0000000..7523328
@@ -0,0 +1 @@
+-pnfs
Signature · 1 line
1.6.6.1
#1 lore raw
Quoted 6 lines · 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.

Quoted 6 lines

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

Quoted 27 lines
---
 Makefile          |    2 +-
 localversion-pnfs |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
 create mode 100644 localversion-pnfs
Makefile +1 -1
index 6ac434c..654c31a 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 35
-EXTRAVERSION = -rc2-pnfs
+EXTRAVERSION = -rc2
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*
localversion-pnfs new file +1 -0
new file mode 100644
index 0000000..7523328
@@ -0,0 +1 @@
+-pnfs
#2 lore raw
In reply to Boaz Harrosh

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

Thanks!

Benny

Quoted 39 lines · 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)

---
 Makefile          |    2 +-
 localversion-pnfs |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
 create mode 100644 localversion-pnfs
Makefile +1 -1
index 6ac434c..654c31a 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 35
-EXTRAVERSION = -rc2-pnfs
+EXTRAVERSION = -rc2
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*
localversion-pnfs new file +1 -0
new file mode 100644
index 0000000..7523328
@@ -0,0 +1 @@
+-pnfs