Message ID | 561994D2.6010307@thinktube.com |
---|---|
State | Not Applicable |
Headers | show |
diff --git a/include/version.mk b/include/version.mk index 9348a24..8bc5319 100644 --- a/include/version.mk +++ b/include/version.mk @@ -21,7 +21,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) #' VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),15.05) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION)) diff --git a/scripts/getver.sh b/scripts/getver.sh index 4643ca6..fa542f1 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -17,9 +17,7 @@ try_svn() { } try_git() { - [ -e .git ] || return 1 - REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')" - REV="${REV:+r$REV}" + REV="$(git describe --tags --dirty)" [ -n "$REV" ] }