From patchwork Wed Aug 18 09:20:07 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Amerigo Wang <amwang@redhat.com>
X-Patchwork-Id: 120118
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7I9Ful4028044
	for <patchwork-kbuild@patchwork.kernel.org>;
	Wed, 18 Aug 2010 09:15:56 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751813Ab0HRJP4 (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Wed, 18 Aug 2010 05:15:56 -0400
Received: from mx1.redhat.com ([209.132.183.28]:44232 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751040Ab0HRJPz (ORCPT <rfc822;linux-kbuild@vger.kernel.org>);
	Wed, 18 Aug 2010 05:15:55 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7I9FnTE026415
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Wed, 18 Aug 2010 05:15:49 -0400
Received: from [10.66.65.142] (dhcp-65-142.nay.redhat.com [10.66.65.142])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o7I9FkCV006033; Wed, 18 Aug 2010 05:15:47 -0400
Message-ID: <4C6BA5C7.5010207@redhat.com>
Date: Wed, 18 Aug 2010 17:20:07 +0800
From: Cong Wang <amwang@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.9) Gecko/20100330 Shredder/3.0.4
MIME-Version: 1.0
To: Brice Goglin <Brice.Goglin@inria.fr>
CC: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
	David Rientjes <rientjes@google.com>, Michal Marek <mmarek@suse.cz>
Subject: Re: [PATCH 2/2] Makefile: "make kernelrelease" should show the
	correct full kernel version
References: <20100628030507.5187.95903.sendpatchset@localhost.localdomain>
	<20100628030516.5187.49089.sendpatchset@localhost.localdomain>
	<4C6B88A5.4050305@inria.fr> <4C6B957C.1090308@redhat.com>
	<4C6B9BFE.1030308@inria.fr> <4C6BA077.2080306@redhat.com>
	<4C6B9F53.6040100@inria.fr>
In-Reply-To: <4C6B9F53.6040100@inria.fr>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 18 Aug 2010 09:15:57 +0000 (UTC)


diff --git a/Makefile b/Makefile
index f3bdff8..25da252 100644
--- a/Makefile
+++ b/Makefile
@@ -1408,8 +1408,8 @@ checkstack:
 	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
 	$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
 
-kernelrelease: include/config/kernel.release
-	@echo $(KERNELRELEASE)
+kernelrelease:
+	@echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
 
 kernelversion:
 	@echo $(KERNELVERSION)