aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2009-02-03 16:24:13 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2009-02-03 16:24:13 +0000
commit8bc48ee10818870823c010d2a2ebcdca45687377 (patch)
tree49ab0108024810db51b4290e796c80effd5f3ef4 /scripts
parent87736033ab385b25b40eeff75042870e7fb858d9 (diff)
downloadbuildroot-8bc48ee10818870823c010d2a2ebcdca45687377.tar.gz
buildroot-8bc48ee10818870823c010d2a2ebcdca45687377.tar.bz2
setlocalversion: sync with HEAD of kernel git
Outputs correct svn revision (latest change, not repo version).
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/setlocalversion14
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index ad72d41473..f6946cf99c 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -9,15 +9,19 @@ usage() {
cd "${1:-.}" || usage
# Check for git and a git repo.
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
# Do we have an untagged version?
if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
- git describe 2>/dev/null | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+ if tag=`git describe 2>/dev/null`; then
+ echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+ else
+ printf '%s%s' -g $head
+ fi
fi
# Is this git on svn?
if git config --get svn-remote.svn.url >/dev/null; then
- printf -- '-svn%s' "`git svn find-rev $head`"
+ printf -- '-svn%s' "`git-svn find-rev $head`"
fi
# Are there uncommitted changes?
@@ -52,13 +56,13 @@ if hgid=`hg id 2>/dev/null`; then
fi
# Check for svn and a svn repo.
-if rev=`svn info 2>/dev/null | grep '^Revision'`; then
+if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
rev=`echo $rev | awk '{print $NF}'`
changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l`
# Are there uncommitted changes?
if [ $changes != 0 ]; then
- printf -- '-svn%s%s%s' "$rev" -dirty "$changes"
+ printf -- '-svn%s%s' "$rev" -dirty
else
printf -- '-svn%s' "$rev"
fi