Fix detectition of kernel git repository in setlocalversion script [take #2]
setlocalversion script was testing the presence of .git directory in order to find out if git is used as SCM to track the current kernel project. However in some cases, .git is not a directory but can be a file: when the kernel is a git submodule part of a git super project for example. This patch just fixes this by using 'git rev-parse --show-cdup' to check that the current directory is the kernel git topdir. This has the advantage to not test and rely on git internal infrastructure directly. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Родитель
6ce4eac1f6
Коммит
7593e0902b
|
@ -43,7 +43,8 @@ scm_version()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for git and a git repo.
|
# Check for git and a git repo.
|
||||||
if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
|
if test -z "$(git rev-parse --show-cdup 2>/dev/null)" &&
|
||||||
|
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
|
# 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.
|
# it, because this version is defined in the top level Makefile.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче