Skip to content

Commit

Permalink
setlocalversion: Ignote SCMs above the linux source tree
Browse files Browse the repository at this point in the history
Dan McGee <[email protected]> writes:
> Note that when in git, you get the appended "+" sign. If
> LOCALVERSION_AUTO is set, you will get something like
> "eee-gb01b08c-dirty" (whereas the copy of the tree in /tmp still
> returns "eee"). It doesn't matter whether the working tree is dirty or
> clean.
>
> Is there a way to disable this? I'm building from a clean tarball that
> just happens to be unpacked inside a git repository. One would think
> setting LOCALVERSION_AUTO to false would do it, but no such luck...

Fix this by checking if the kernel source tree is the root of the git or
hg repository. No fix for svn: If the kernel source is not tracked in
the svn repository, it works as expected, otherwise determining the
'repository root' is not really a defined task.

Reported-and-tested-by: Dan McGee <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
michal42 committed Aug 21, 2010
1 parent 7b8ea53 commit 8558f59
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/setlocalversion
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ scm_version()
fi

# Check for git and a git repo.
if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then

# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
# it, because this version is defined in the top level Makefile.
Expand Down Expand Up @@ -85,7 +85,7 @@ scm_version()
fi

# Check for mercurial and a mercurial repo.
if hgid=`hg id 2>/dev/null`; then
if test -d .hg && hgid=`hg id 2>/dev/null`; then
tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`

# Do we have an untagged version?
Expand Down

0 comments on commit 8558f59

Please sign in to comment.