2012-10-23 12:21:34 +00:00
|
|
|
--- a/scripts/setlocalversion
|
|
|
|
|
+++ b/scripts/setlocalversion
|
2012-10-24 13:05:22 +00:00
|
|
|
@@ -167,7 +167,7 @@ else
|
2012-10-23 12:21:34 +00:00
|
|
|
# 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
|
|
|
|
|
+ if test "${CONFIG_LOCALVERSION+set}" != "set"; then
|
|
|
|
|
scm=$(scm_version --short)
|
|
|
|
|
res="$res${scm:++}"
|
|
|
|
|
fi
|
