From patchwork Thu Oct  7 20:18:52 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: alan.tull@freescale.com
X-Patchwork-Id: 238841
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o97KJ8HG003332
	for <patchwork-kbuild@patchwork.kernel.org>;
	Thu, 7 Oct 2010 20:19:08 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755370Ab0JGUTH (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Thu, 7 Oct 2010 16:19:07 -0400
Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:57534
	"EHLO VA3EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1755288Ab0JGUTH (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Thu, 7 Oct 2010 16:19:07 -0400
Received: from mail136-va3-R.bigfish.com (10.7.14.252) by
	VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id
	14.1.225.8; Thu, 7 Oct 2010 20:19:05 +0000
Received: from mail136-va3 (localhost.localdomain [127.0.0.1])	by
	mail136-va3-R.bigfish.com (Postfix) with ESMTP id 55C551870334;
	Thu,  7 Oct 2010 20:19:05 +0000 (UTC)
X-SpamScore: 0
X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h61h)
X-Spam-TCS-SCL: 0:0
Received: from mail136-va3 (localhost.localdomain [127.0.0.1]) by mail136-va3
	(MessageSwitch) id 1286482743730576_7178;
	Thu,  7 Oct 2010 20:19:03 +0000 (UTC)
Received: from VA3EHSMHS008.bigfish.com (unknown [10.7.14.236])	by
	mail136-va3.bigfish.com (Postfix) with ESMTP id AF1AB310050;
	Thu,  7 Oct 2010 20:19:03 +0000 (UTC)
Received: from az33egw01.freescale.net (192.88.158.102) by
	VA3EHSMHS008.bigfish.com (10.7.99.18) with Microsoft SMTP Server
	(TLS) id 14.0.482.44; Thu, 7 Oct 2010 20:19:00 +0000
Received: from az33smr02.freescale.net (az33smr02.freescale.net
	[10.64.34.200])	by az33egw01.freescale.net (8.14.3/8.14.3) with ESMTP
	id o97KIncA011262;	Thu, 7 Oct 2010 13:18:49 -0700 (MST)
Received: from localhost.localdomain (bluebunny.am.freescale.net
	[10.81.68.23])	by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP
	id o97KImFu028858;	Thu, 7 Oct 2010 15:18:48 -0500 (CDT)
From: <alan.tull@freescale.com>
To: <mmarek@suse.cz>
CC: <linux-kbuild@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Alan Tull <alan.tull@freescale.com>
Subject: [PATCH] Fix LOCALVERSION append plus logic
Date: Thu, 7 Oct 2010 15:18:52 -0500
Message-ID: <1286482732-12087-1-git-send-email-alan.tull@freescale.com>
X-Mailer: git-send-email 1.6.0.4
MIME-Version: 1.0
X-Reverse-DNS: az33egw01.freescale.net
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 (demeter1.kernel.org [140.211.167.41]);
	Thu, 07 Oct 2010 20:19:08 +0000 (UTC)


diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 64a9cb5..4488a33 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -160,9 +160,9 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
 	# full scm version string
 	res="$res$(scm_version)"
 else
-	# apped a plus sign if the repository is not in a clean tagged
+	# append a plus sign if the repository is not in a clean tagged
 	# state and  LOCALVERSION= is not specified
-	if test "${LOCALVERSION+set}" != "set"; then
+	if test "$CONFIG_LOCALVERSION" = ""; then
 		scm=$(scm_version --short)
 		res="$res${scm:++}"
 	fi