summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-14 20:48:37 +0000
committerJohn Crispin <john@openwrt.org>2015-02-14 20:48:37 +0000
commit59acb0b8f42cdde32943ed6906a9e2cefa849526 (patch)
tree62f9190c63f16361c7297d8df81910bc96ec798d
parente07c4f21506e33c5467aafeb4dbd11d9ad87201b (diff)
downloadmtk-20170518-59acb0b8f42cdde32943ed6906a9e2cefa849526.zip
mtk-20170518-59acb0b8f42cdde32943ed6906a9e2cefa849526.tar.gz
mtk-20170518-59acb0b8f42cdde32943ed6906a9e2cefa849526.tar.bz2
scripts: fix getver git dir check
Git internals are referenced by .git which isn't necessarily a directory. It may also be a file that references the actual .git directory using the gitdir directive. If .git is assumed to be a directory the build will not be able to get the correct version when openwrt is included as a git submodule because when used as a submodule .git will actually be a file referencing to a subdirectory in the parent's git dir. When the correct version is not detected some image generation tools will fail because the OpenWrt string will be 'OpenWrtunknown' which is too long for some header formats. Signed-off-by: Felix Kaechele <heffer@fedoraproject.org> SVN-Revision: 44452
-rwxr-xr-xscripts/getver.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh
index 8bb384b..4643ca6 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -17,7 +17,7 @@ try_svn() {
}
try_git() {
- [ -d .git ] || return 1
+ [ -e .git ] || return 1
REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
REV="${REV:+r$REV}"
[ -n "$REV" ]