aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/200-fix_localversion.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
committerJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
commitf8c7d2d540cb3ef04ea077a54ab40032f2a50976 (patch)
treecc4ae0400759c09d1eb08510f89711899bf63bce /target/linux/generic/patches-3.1/200-fix_localversion.patch
parentc025c5e99da524b1bb8fc9bdf00836f4e7402d96 (diff)
downloadupstream-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.tar.gz
upstream-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.tar.bz2
upstream-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.zip
linux: generic: add support for 3.1-rc1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27940 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/200-fix_localversion.patch')
-rw-r--r--target/linux/generic/patches-3.1/200-fix_localversion.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/200-fix_localversion.patch b/target/linux/generic/patches-3.1/200-fix_localversion.patch
new file mode 100644
index 0000000000..0d1bae8d45
--- /dev/null
+++ b/target/linux/generic/patches-3.1/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -168,7 +168,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