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-a3cf2f4a3e73master
parent
973f88e0d5
commit
0709b59745
|
@ -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" ]
|
||||
|
|
Loading…
Reference in New Issue