diff options
| author | Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> | 2006-06-16 08:47:57 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-06-17 00:08:17 +0200 |
| commit | 29b0c89953fee8597b4a9cbdd763c294ae0eb4c7 (patch) | |
| tree | bed171b01b2ef2c5dc82ac4b0f0473dd703074d2 | |
| parent | 9ac545b0f7161eaf2e180acc406c1dd6fdd77686 (diff) | |
| download | talos-obmc-linux-29b0c89953fee8597b4a9cbdd763c294ae0eb4c7.tar.gz talos-obmc-linux-29b0c89953fee8597b4a9cbdd763c294ae0eb4c7.zip | |
kbuild: append git revision for all untagged commits
adds revision suffix for untagged commits that are reachable from a tag
I'm bisecting and don't get the -g...... suffix. The reason is, that
git name-rev --tags HEAD
returns e.g.
HEAD tags/v2.6.17-rc1^0~1067
which is currently good enough for setlocalversion to skip the suffix.
This introduces a dependecy to grep -E, which should be fine.
Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
Acked-By: Ryan Anderson <ryan@michonline.com>
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 9a23825218f2..b7bc0f5b64f6 100644 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -11,7 +11,7 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version? - if [ "`git name-rev --tags HEAD`" = "HEAD undefined" ]; then + 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` fi |
