diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-05-03 22:05:16 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-05-03 22:07:08 +0200 |
| commit | a1ec5b86d169b0e0e89443ad90cdf2b2fa99f281 (patch) | |
| tree | ef117a353c8eb7650ef1d32003db1a24eefdf293 | |
| parent | 6dcc971adef2d75118364a427801112d435f49ef (diff) | |
| download | ptxdist-a1ec5b86d169b0e0e89443ad90cdf2b2fa99f281.tar.gz ptxdist-a1ec5b86d169b0e0e89443ad90cdf2b2fa99f281.tar.xz | |
[setlocalversion] fix version generation for releases
Without this patch, the version of the release will be printed as:
ptxdist-2010.05.0-00000-2010.05.0
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rwxr-xr-x | scripts/kernel/setlocalversion | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/kernel/setlocalversion b/scripts/kernel/setlocalversion index 5073879ae..fd39336be 100755 --- a/scripts/kernel/setlocalversion +++ b/scripts/kernel/setlocalversion @@ -48,14 +48,19 @@ cd "$(dirname "${tarball_version_file}")" # Check for git and a git repo. if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + # If we are at a tagged commit (like "ptxdist-2010.05.0"), we + # print it here + if atag="`git describe --exact-match 2>/dev/null`"; then + printf -- '%s' $atag + # If we are past a tagged commit (like "ptxdist-2010.03.0-130-g3c60777"), # we pretty print it. - if atag="`git describe 2>/dev/null`"; then + elif atag="`git describe 2>/dev/null`"; then echo "$atag" | awk -F- '{printf("%s-%05d-%s", $(NF-2),$(NF-1),$(NF))}' # If we don't have a tag at all we print ????.??.?-?-g{commitish}. else - printf '%s%s' ????.??.?-?-g $head + printf '%s%s' '????.??.?-?-g' $head fi # Is this git on svn? |