diff options
author | Theodore Ts'o <tytso@mit.edu> | 2007-11-02 21:52:59 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-01-28 17:14:37 -0500 |
commit | d882421f4e08ddf0a94245cdbe516db260aa6f41 (patch) | |
tree | ac53706f5325d957b2fef7a79cdef1cd6bdd4937 | |
parent | 22d6a6a018d897c9c77c6af164722926e70108fa (diff) |
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>
-rw-r--r-- | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index a80d6ea8a5bf..1b31da843672 100644 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion | |||
@@ -12,7 +12,7 @@ cd "${1:-.}" || usage | |||
12 | if head=`git rev-parse --verify HEAD 2>/dev/null`; then | 12 | if head=`git rev-parse --verify HEAD 2>/dev/null`; then |
13 | # Do we have an untagged version? | 13 | # Do we have an untagged version? |
14 | if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then | 14 | if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then |
15 | printf '%s%s' -g `echo "$head" | cut -c1-8` | 15 | git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' |
16 | fi | 16 | fi |
17 | 17 | ||
18 | # Are there uncommitted changes? | 18 | # Are there uncommitted changes? |