From 93a2c2e7f036d385227e264bb49bd823b4d28427 Mon Sep 17 00:00:00 2001 From: Tao Hu Date: Wed, 8 Aug 2012 17:30:06 +0800 Subject: scripts: Make git commit info always present LOCALVERSION_AUTO is set by default. And git commit will be part of the version. E.g. "3.1.10-g0fe9b4a" where 0fe9b4a is the commit. The version will appear in kpanic logs. It would help developers to know the exact kernel version. But a tagged commit (main-ics-2012.06.07-A5) will lead to no git info. E.g. "3.1.10" This patch will solve the issue. Change-Id: I28370ada903b4be12bfc51eb3626512572e15c20 wChange-Id: I9dbb6c0a9e2964ead92114197a6d5c457ed7aab9 Signed-off-by: Tao Hu Reviewed-on: http://git-master/r/123670 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Prajakta Gudadhe GVS: Gerrit_Virtual_Submit Reviewed-by: Scott Peterson Rebase-Id: R4634652e8627a86f7d4034e7657e45d10eb1f33f --- scripts/setlocalversion | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'scripts') diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 84b88f109b80..b16a1849a160 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -45,26 +45,9 @@ scm_version() # Check for git and a git repo. if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then - # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore - # it, because this version is defined in the top level Makefile. - if [ -z "`git describe --exact-match 2>/dev/null`" ]; then - - # If only the short version is requested, don't bother - # running further git commands - if $short; then - echo "+" - return - fi - # If we are past a tagged commit (like - # "v2.6.30-rc5-302-g72357d5"), we pretty print it. - if atag="`git describe 2>/dev/null`"; then - echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' - - # If we don't have a tag at all we print -g{commitish}. - else - printf '%s%s' -g $head - fi - fi + # Regardless whether it is a tagged commit (like "v2.6.30-rc6"), + # we will put the commit info in. + printf '%s%s' -g $head # Is this git on svn? if git config --get svn-remote.svn.url >/dev/null; then -- cgit v1.2.3