Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754933Ab0FIGzm (ORCPT ); Wed, 9 Jun 2010 02:55:42 -0400 Received: from smtp-out.google.com ([74.125.121.35]:33212 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751407Ab0FIGzk (ORCPT ); Wed, 9 Jun 2010 02:55:40 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id: references:user-agent:mime-version:content-type; b=ZYgCpb/vs3TWcRQwA5BUudyHjVftxuPXlYR3vnIOr1jAVgjSJtVm1cmtPyEHQH6Pp 1eDFj6Yi1uI50F5yXSXSA== Date: Tue, 8 Jun 2010 23:55:32 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Boaz Harrosh cc: Linus Torvalds , Ingo Molnar , Frans Pop , Dirk Hohndel , Len Brown , linux-kernel@vger.kernel.org Subject: Re: kbuild: Fix the breakage caused by "improve version string logic" In-Reply-To: <4C0E17F0.5010902@panasas.com> Message-ID: References: <1254797502.14122.146.camel@dhohndel-mobl.amr.corp.intel.com> <20091006144449.GA23078@elte.hu> <20091006153632.GA29795@elte.hu> <20091006173508.GA4786@elte.hu> <20091012195733.GA7351@elte.hu> <4C0D29DE.6050602@panasas.com> <4C0DFFFF.1010704@panasas.com> <4C0E17F0.5010902@panasas.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1757 Lines: 48 On Tue, 8 Jun 2010, Boaz Harrosh wrote: > What is a tagged commit: > > [my_tree] $ git branch > *master > [my_tree] $ git tag v2.6.35-rc2-my-tree > [my_tree] $ cat localversion-my-tree > -my-tree > > I still get: DEPMOD 2.6.35-rc2-my-tree+ > > How to solve? please specify. > You need to use git tag -a. > In my tree there is 2.6.35-rc2-my-tree so it cannot be mistaken with > Linus tree. > Just because you have appended "-my-tree" to the version string does not mean it is not vanilla 2.6.35-rc2. You could append information such as that just for a different config, for instance. The `+' modifies the base kernel version (2.6.35-rc2), not the string itself or whatever you choose to add to it. > > As mentioned previously, you can easily suppress that from being added by > > using "make LOCALVERSION=-foo" to create a 2.6.35-rc2-foo kernel when you > > do not have CONFIG_LOCALVERSION_AUTO enabled. You already found that you > > cannot pass an empty LOCALVERSION string, so it must be something to > > identify itself as unique from vanilla 2.6.35-rc2. > > > > As mentioned previously this is not an option I do not have git control > over how this gets compiled. > If your git repository is publically accessible, it is very simple to tag commits that you want your users to pull from to indicate it's a "release". That allows you to determine whether other users have extra commits on top of your release when they send you bug reports, for example, which is quite helpful. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/