96f49098f2
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
12 lines
397 B
Diff
12 lines
397 B
Diff
--- a/scripts/setlocalversion
|
|
+++ b/scripts/setlocalversion
|
|
@@ -165,7 +165,7 @@ else
|
|
# 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
|