[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100628030507.5187.95903.sendpatchset@localhost.localdomain>
Date: Sun, 27 Jun 2010 23:00:57 -0400
From: Amerigo Wang <amwang@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: Michal Marek <mmarek@...e.cz>,
David Rientjes <rientjes@...gle.com>,
Amerigo Wang <amwang@...hat.com>, linux-kbuild@...r.kernel.org
Subject: [PATCH 1/2] Makefile: fix missing dash when using make LOCALVERSION=xxx
From: Amerigo Wang <amwang@...hat.com>
Date: Mon, 28 Jun 2010 10:42:28 +0800
When I use make LOCALVERSION=local and LOCALVERSION_AUTO is not set,
I got "2.6.35-rc3local". It is supposed to be "2.6.35-rc3-local".
Cc: Michal Marek <mmarek@...e.cz>
Cc: David Rientjes <rientjes@...gle.com>
Signed-off-by: Amerigo Wang <amwang@...hat.com>
---
Makefile | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 662e820..710f91c 100644
--- a/Makefile
+++ b/Makefile
@@ -950,7 +950,11 @@ else
endif
endif
-localver-full = $(localver)$(LOCALVERSION)$(localver-extra)
+ifneq ($(LOCALVERSION),)
+ localver-full = $(localver)-$(LOCALVERSION)$(localver-extra)
+else
+ localver-full = $(localver)$(LOCALVERSION)$(localver-extra)
+endif
# Store (new) KERNELRELASE string in include/config/kernel.release
kernelrelease = $(KERNELVERSION)$(localver-full)
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists