aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/200-fix_localversion.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-03-07 11:27:00 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-03-07 11:27:00 +0000
commit2b43bb49dec4546cdca7e627b06e7682ae742591 (patch)
tree0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/200-fix_localversion.patch
parent3be7023c9be4e1381699ce393638ad63565c9ac5 (diff)
downloadupstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz
upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2
upstream-2b43bb49dec4546cdca7e627b06e7682ae742591.zip
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/200-fix_localversion.patch')
-rw-r--r--target/linux/generic/patches-3.14/200-fix_localversion.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/200-fix_localversion.patch b/target/linux/generic/patches-3.14/200-fix_localversion.patch
new file mode 100644
index 0000000000..70228bb5f4
--- /dev/null
+++ b/target/linux/generic/patches-3.14/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- 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