diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-16 17:09:52 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-21 15:14:59 +0200 |
| commit | 8558f59edf935cf5ee5ffc29a9e9458fd9a71be1 (patch) | |
| tree | 7c5f4db113ca10dfbaeb193a762282809fb9cb8b /scripts | |
| parent | 7b8ea53d7f1865cd8f05dfb8f706a4ff5a72abcf (diff) | |
| download | linux-3.10-8558f59edf935cf5ee5ffc29a9e9458fd9a71be1.tar.gz linux-3.10-8558f59edf935cf5ee5ffc29a9e9458fd9a71be1.tar.bz2 linux-3.10-8558f59edf935cf5ee5ffc29a9e9458fd9a71be1.zip | |
setlocalversion: Ignote SCMs above the linux source tree
Dan McGee <dpmcgee@gmail.com> 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 <dpmcgee@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setlocalversion | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index e90a91cc518..057b6b3c5df 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -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. @@ -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? |