summaryrefslogtreecommitdiff
path: root/scripts/setlocalversion
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-11-02 21:52:59 -0400
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 23:14:37 +0100
commitd882421f4e08ddf0a94245cdbe516db260aa6f41 (patch)
treeac53706f5325d957b2fef7a79cdef1cd6bdd4937 /scripts/setlocalversion
parent22d6a6a018d897c9c77c6af164722926e70108fa (diff)
downloadlinux-3.10-d882421f4e08ddf0a94245cdbe516db260aa6f41.tar.gz
linux-3.10-d882421f4e08ddf0a94245cdbe516db260aa6f41.tar.bz2
linux-3.10-d882421f4e08ddf0a94245cdbe516db260aa6f41.zip
kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format
Change the automatic local version to have the form -nnnnn-gSHA1SUMID, where 'nnnnn' is the number of commits since the last tag (i.e., 2.6.21-rc7). This makes it much more likely that the package names created for the kernel will look "newer" to a package manager. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/setlocalversion')
-rw-r--r--scripts/setlocalversion2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index a80d6ea8a5b..1b31da84367 100644
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -12,7 +12,7 @@ cd "${1:-.}" || usage
if head=`git rev-parse --verify 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
- printf '%s%s' -g `echo "$head" | cut -c1-8`
+ git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
fi
# Are there uncommitted changes?