From 59acb0b8f42cdde32943ed6906a9e2cefa849526 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 14 Feb 2015 20:48:37 +0000 Subject: [PATCH] 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 SVN-Revision: 44452 --- scripts/getver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" ] -- 2.25.1