1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 19:53:09 +02:00
openwrt-xburst/target/linux/generic-2.6/patches-2.6.31/997-scripts-localversion-check-git-repo-path.patch

21 lines
677 B
Diff
Raw Normal View History

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 46989b8..887960f 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -18,6 +18,7 @@ cd "${1:-.}" || usage
# Check for git and a git repo.
if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+if [ `git rev-parse --git-dir` = ".git" ]; 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.
@@ -51,6 +52,7 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
# All done with git
exit
fi
+fi
# Check for mercurial and a mercurial repo.
if hgid=`hg id 2>/dev/null`; then