aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-04-09 11:46:18 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-04-09 11:46:18 +0000
commitebff5cd2b74ade477d152a057c194110bcf3e568 (patch)
treef9eaa2f7c8ad5ee7bcd52f9cfcd5a3fd15de0879 /target/linux
parentd2d8970828ed80e22f7ff8a63f2edd37527606b9 (diff)
downloadupstream-ebff5cd2b74ade477d152a057c194110bcf3e568.tar.gz
upstream-ebff5cd2b74ade477d152a057c194110bcf3e568.tar.bz2
upstream-ebff5cd2b74ade477d152a057c194110bcf3e568.zip
upgrade to 3.14
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 40433
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86_64/Makefile2
-rw-r--r--target/linux/x86_64/patches/011-tune_lzma_options.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile
index 108de3abd2..085ba6805e 100644
--- a/target/linux/x86_64/Makefile
+++ b/target/linux/x86_64/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=x86_64
FEATURES:=ext4 vdi vmdk targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.13.7
+LINUX_VERSION:=3.14
KERNELNAME:=bzImage
diff --git a/target/linux/x86_64/patches/011-tune_lzma_options.patch b/target/linux/x86_64/patches/011-tune_lzma_options.patch
index 1421f7c8fa..168c3dd731 100644
--- a/target/linux/x86_64/patches/011-tune_lzma_options.patch
+++ b/target/linux/x86_64/patches/011-tune_lzma_options.patch
@@ -1,6 +1,6 @@
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
-@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -304,7 +304,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \