Messages in this thread Patch in this message |  | | | Date | Tue, 08 Jun 2010 11:31:59 +0300 | | From | Boaz Harrosh <> | | Subject | kbuild: Fix the breakage caused by "improve version string logic" |
| |
The patch: 85a256d8e0116c8f5ad276730830f5d4d473344d Author: David Rientjes <rientjes@google.com> Title: kbuild: improve version string logic
Broke none Linus trees that supply their own version string and tag system via a presence of a localversion* file at the Kernel's root subdirectory.
After This patch. The "+" (plus) is not added if a localversion* file is present or a CONFIG_LOCALVERSION is configured.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> --- Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 654c31a..324a413 100644 --- a/Makefile +++ b/Makefile @@ -945,7 +945,9 @@ ifdef CONFIG_LOCALVERSION_AUTO else ifneq ($(scm-identifier),) ifeq ($(LOCALVERSION),) - localver-extra = + + ifeq ($(localver),) + localver-extra = + + endif endif endif endif -- 1.6.6.1
|  |