From patchwork Mon May 30 14:50:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 830332 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4UEqX24002602 for ; Mon, 30 May 2011 14:52:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781Ab1E3OwK (ORCPT ); Mon, 30 May 2011 10:52:10 -0400 Received: from cantor.suse.de ([195.135.220.2]:57920 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757224Ab1E3OvE (ORCPT ); Mon, 30 May 2011 10:51:04 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id E68B45362F; Mon, 30 May 2011 16:51:03 +0200 (CEST) Received: by sepie.suse.cz (Postfix, from userid 10020) id A8B9A76869; Mon, 30 May 2011 16:51:03 +0200 (CEST) From: Michal Marek To: Linus Torvalds Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] kbuild: Fix KERNELVERSION for X.Y versions Date: Mon, 30 May 2011 16:50:49 +0200 Message-Id: <1306767052-15593-2-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1306767052-15593-1-git-send-email-mmarek@suse.cz> References: <1306767052-15593-1-git-send-email-mmarek@suse.cz> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 30 May 2011 14:52:34 +0000 (UTC) Omit the second dot for releases without SUBLEVEL. Signed-off-by: Michal Marek --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index afb8e0d..c706ae1 100644 --- a/Makefile +++ b/Makefile @@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +KERNELVERSION = $(VERSION).$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC