Re: kbuild: Fix the breakage caused by "improve version string logic"

Boaz Harrosh
2010-06-08T10:19:45Z

On 06/08/2010 01:14 PM, Boaz Harrosh wrote:
> On 06/08/2010 12:13 PM, David Rientjes wrote:
>> On Tue, 8 Jun 2010, Boaz Harrosh wrote:
>>
>>>
>>> The patch: 85a256d8e0116c8f5ad276730830f5d4d473344d
>>> Author: David Rientjes <rientjes@google.com>
>>> Title: kbuild: improve version string logic
>>>
>>> Broke none Linus trees that supply their own version string and
>>> tag system via a presence of a localversion* file at the Kernel's
>>> root subdirectory.
>>>
>>> After This patch. The "+" (plus) is not added if a localversion*
>>> file is present or a CONFIG_LOCALVERSION is configured.
>>>
>>
>> The only reason the `+' is being appended to your version string is
>> because your scm is reporting that there have been commits to the tree
>> since the last release; for git, that means anything that isn't at a
>> tagged commit.
>>
>
> What is a tagged commit:
>
> [my_tree] $ git branch
> *master
> [my_tree] $ git tag v2.6.35-rc2-my-tree

OK now I get it I need:
$ git tag -a v2.6.35-rc2-my-tree

I never used the -a before though no one complained. What else
am I missing?

Boaz

> [my_tree] $ cat localversion-my-tree
> -my-tree
>
> I still get: DEPMOD 2.6.35-rc2-my-tree+
>
> How to solve? please specify.
>