diff options
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 057b6b3c5dfb..ef8729f48586 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion | |||
| @@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then | |||
| 160 | # full scm version string | 160 | # full scm version string |
| 161 | res="$res$(scm_version)" | 161 | res="$res$(scm_version)" |
| 162 | else | 162 | else |
| 163 | # apped a plus sign if the repository is not in a clean tagged | 163 | # append a plus sign if the repository is not in a clean |
| 164 | # state and LOCALVERSION= is not specified | 164 | # annotated or signed tagged state (as git describe only |
| 165 | # looks at signed or annotated tags - git tag -a/-s) and | ||
| 166 | # LOCALVERSION= is not specified | ||
| 165 | if test "${LOCALVERSION+set}" != "set"; then | 167 | if test "${LOCALVERSION+set}" != "set"; then |
| 166 | scm=$(scm_version --short) | 168 | scm=$(scm_version --short) |
| 167 | res="$res${scm:++}" | 169 | res="$res${scm:++}" |
