From: Cong Wang <amwang@redhat.com>
To: Michal Marek <mmarek@suse.cz>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
David Rientjes <rientjes@google.com>
Subject: Re: [PATCH 2/2] Makefile: "make kernelrelease" should show the correct full kernel version
Date: Wed, 30 Jun 2010 18:39:28 +0800 [thread overview]
Message-ID: <4C2B1EE0.2080301@redhat.com> (raw)
In-Reply-To: <20100629121315.GA13335@sepie.suse.cz>
On 06/29/10 20:13, Michal Marek wrote:
> On Sun, Jun 27, 2010 at 11:01:06PM -0400, Amerigo Wang wrote:
>> From: Amerigo Wang<amwang@redhat.com>
>> Date: Mon, 28 Jun 2010 10:45:21 +0800
>>
>> After commit 85a256d8e0116c8f5ad276730830f5d4d473344d, 'make kernelrelease' doesn't
>> show the correct full kernel version. This patch fixes it, 'make kernelrelease' will
>> show the same version name with the one you finally get.
>>
>> Cc: David Rientjes<rientjes@google.com>
>> Cc: Michal Marek<mmarek@suse.cz>
>> Signed-off-by: Amerigo Wang<amwang@redhat.com>
>> ---
>> Makefile | 5 ++---
>> 1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 710f91c..2b517a1 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -414,7 +414,7 @@ endif
>> no-dot-config-targets := clean mrproper distclean \
>> cscope TAGS tags help %docs check% \
>> include/linux/version.h headers_% \
>> - kernelrelease kernelversion
>> + kernelversion
>>
>> config-targets := 0
>> mixed-targets := 0
>> @@ -1468,8 +1468,7 @@ checkstack:
>> $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
>>
>> kernelrelease:
>> - $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \
>> - $(error kernelrelease not valid - run 'make prepare' to update it))
>> + @echo $(kernelrelease)
>> kernelversion:
>> @echo $(KERNELVERSION)
>
> AFAICS it was broken even before 85a256d. Nevertheless, the patch is
> correct, but conflicts with 0915512 in the kbuild tree. What about this
> one?
>
Hmm, I am not sure. IIRC, my first try was also using KERNELRELEASE but it
didn't work. Note, I may remember wrongly. :)
Have you tested it? Sorry that currently I don't have time to test it, I am
quite busy with other stuffs...
Thanks!
next prev parent reply other threads:[~2010-06-30 10:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-28 3:00 [PATCH 1/2] Makefile: fix missing dash when using make LOCALVERSION=xxx Amerigo Wang
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:17 ` Michal Marek
2010-06-30 10:39 ` Cong Wang [this message]
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=4C2B1EE0.2080301@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).