From: Amerigo Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Michal Marek <mmarek@suse.cz>,
David Rientjes <rientjes@google.com>,
Amerigo Wang <amwang@redhat.com>,
linux-kbuild@vger.kernel.org
Subject: [PATCH 1/2] Makefile: fix missing dash when using make LOCALVERSION=xxx
Date: Sun, 27 Jun 2010 23:00:57 -0400 [thread overview]
Message-ID: <20100628030507.5187.95903.sendpatchset@localhost.localdomain> (raw)
From: Amerigo Wang <amwang@redhat.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@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Amerigo Wang <amwang@redhat.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
next reply other threads:[~2010-06-28 3:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-28 3:00 Amerigo Wang [this message]
2010-06-28 3:01 ` [PATCH 2/2] Makefile: "make kernelrelease" should show the correct full kernel version Amerigo Wang
2010-06-29 12:13 ` Michal Marek
2010-06-29 12:13 ` Michal Marek
2010-06-29 12:17 ` Michal Marek
2010-06-30 10:39 ` Cong Wang
2010-08-18 7:15 ` Brice Goglin
2010-08-18 8:10 ` Cong Wang
2010-08-18 8:38 ` Brice Goglin
2010-08-18 8:57 ` Cong Wang
2010-08-18 8:52 ` Brice Goglin
2010-08-18 9:20 ` Cong Wang
2010-08-18 9:17 ` Brice Goglin
2010-06-28 9:08 ` [PATCH 1/2] Makefile: fix missing dash when using make LOCALVERSION=xxx David Rientjes
2010-06-28 9:25 ` Cong Wang
2010-06-28 18:46 ` David Rientjes
2010-06-29 1:45 ` Cong Wang
2010-06-29 12:14 ` Michal Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100628030507.5187.95903.sendpatchset@localhost.localdomain \
--to=amwang@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.