aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-14 20:48:37 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-14 20:48:37 +0000
commit0709b59745cca0191ade10af764006e1f40e8b63 (patch)
treefeafbffab708fc897d5e82a3cc327b0cc21b2788 /scripts
parent973f88e0d553f9e759aec13c31f184ff64d88906 (diff)
downloadupstream-0709b59745cca0191ade10af764006e1f40e8b63.tar.gz
upstream-0709b59745cca0191ade10af764006e1f40e8b63.tar.bz2
upstream-0709b59745cca0191ade10af764006e1f40e8b63.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44452 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/getver.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh
index 8bb384bd53..4643ca63ff 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" ]