|
|
@ -169,15 +169,6 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" |
|
|
|
if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then |
|
|
|
if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then |
|
|
|
# full scm version string |
|
|
|
# full scm version string |
|
|
|
res="$res$(scm_version)" |
|
|
|
res="$res$(scm_version)" |
|
|
|
else |
|
|
|
|
|
|
|
# append a plus sign if the repository is not in a clean |
|
|
|
|
|
|
|
# annotated or signed tagged state (as git describe only |
|
|
|
|
|
|
|
# looks at signed or annotated tags - git tag -a/-s) and |
|
|
|
|
|
|
|
# LOCALVERSION= is not specified |
|
|
|
|
|
|
|
if test "${LOCALVERSION+set}" != "set"; then |
|
|
|
|
|
|
|
scm=$(scm_version --short) |
|
|
|
|
|
|
|
res="$res${scm:++}" |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
echo "$res" |
|
|
|
echo "$res" |
|
|
|