summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in6
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/linux/config/Config.in.netfilter.ip44
-rw-r--r--target/linux/patches/3.4.87/bsd-compatibility.patch (renamed from target/linux/patches/3.4.84/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.4.87/defaults.patch (renamed from target/linux/patches/3.4.84/defaults.patch)0
-rw-r--r--target/linux/patches/3.4.87/gemalto.patch (renamed from target/linux/patches/3.4.84/gemalto.patch)0
-rw-r--r--target/linux/patches/3.4.87/lemote-rfkill.patch (renamed from target/linux/patches/3.4.84/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.4.87/mips-error.patch (renamed from target/linux/patches/3.4.84/mips-error.patch)0
-rw-r--r--target/linux/patches/3.4.87/module-alloc-size-check.patch (renamed from target/linux/patches/3.4.84/module-alloc-size-check.patch)0
-rw-r--r--target/linux/patches/3.4.87/non-static.patch (renamed from target/linux/patches/3.4.84/non-static.patch)0
-rw-r--r--target/linux/patches/3.4.87/sparc-include.patch (renamed from target/linux/patches/3.4.84/sparc-include.patch)0
-rw-r--r--target/linux/patches/3.4.87/startup.patch (renamed from target/linux/patches/3.4.84/startup.patch)0
-rw-r--r--target/linux/patches/3.4.87/usb-defaults-off.patch (renamed from target/linux/patches/3.4.84/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.4.87/uuid.patch (renamed from target/linux/patches/3.4.84/uuid.patch)0
-rw-r--r--target/linux/patches/3.4.87/vga-cons-default-off.patch (renamed from target/linux/patches/3.4.84/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.4.87/wlan-cf.patch (renamed from target/linux/patches/3.4.84/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.4.87/zlib-inflate.patch (renamed from target/linux/patches/3.4.84/zlib-inflate.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.87/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.84/aufs2.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.87/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.84/linux-gcc-check.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.87/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.84/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.87/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.84/relocs.patch)0
21 files changed, 8 insertions, 8 deletions
diff --git a/Config.in b/Config.in
index ef7080bba..aa50d3829 100644
--- a/Config.in
+++ b/Config.in
@@ -127,8 +127,8 @@ config ADK_KERNEL_VERSION_3_10_37
prompt "3.10.37"
boolean
-config ADK_KERNEL_VERSION_3_4_84
- prompt "3.4.84"
+config ADK_KERNEL_VERSION_3_4_87
+ prompt "3.4.87"
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
boolean
@@ -141,7 +141,7 @@ config ADK_KERNEL_VERSION
default "3.12.18" if ADK_KERNEL_VERSION_3_12_18
default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
default "3.10.37" if ADK_KERNEL_VERSION_3_10_37
- default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
+ default "3.4.87" if ADK_KERNEL_VERSION_3_4_87
help
config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 110962020..1ba7abcd9 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -34,9 +34,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= a08a10ffc31b07d9422af1cd2baa3274
endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
-KERNEL_VERSION:= 3.4.84
+ifeq ($(ADK_KERNEL_VERSION_3_4_87),y)
+KERNEL_VERSION:= 3.4.87
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= b99f88ca356b5003ce44e952baa3e6a3
+KERNEL_MD5SUM:= f926dc8c57400f57aec407106632de0b
endif
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 7a91fa9e9..046fe8254 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,7 +36,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
config ADK_KPACKAGE_KMOD_FULL_NAT
tristate "Meta package for Full NAT"
- select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84
+ select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_87
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_37
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18
@@ -46,7 +46,7 @@ config ADK_KPACKAGE_KMOD_FULL_NAT
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_4_84
+ depends on ADK_KERNEL_VERSION_3_4_87
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by
diff --git a/target/linux/patches/3.4.84/bsd-compatibility.patch b/target/linux/patches/3.4.87/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.84/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.87/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.84/defaults.patch b/target/linux/patches/3.4.87/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.84/defaults.patch
+++ b/target/linux/patches/3.4.87/defaults.patch
diff --git a/target/linux/patches/3.4.84/gemalto.patch b/target/linux/patches/3.4.87/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.84/gemalto.patch
+++ b/target/linux/patches/3.4.87/gemalto.patch
diff --git a/target/linux/patches/3.4.84/lemote-rfkill.patch b/target/linux/patches/3.4.87/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.84/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.87/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.84/mips-error.patch b/target/linux/patches/3.4.87/mips-error.patch
index 800abc80d..800abc80d 100644
--- a/target/linux/patches/3.4.84/mips-error.patch
+++ b/target/linux/patches/3.4.87/mips-error.patch
diff --git a/target/linux/patches/3.4.84/module-alloc-size-check.patch b/target/linux/patches/3.4.87/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.84/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.87/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.84/non-static.patch b/target/linux/patches/3.4.87/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.84/non-static.patch
+++ b/target/linux/patches/3.4.87/non-static.patch
diff --git a/target/linux/patches/3.4.84/sparc-include.patch b/target/linux/patches/3.4.87/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.84/sparc-include.patch
+++ b/target/linux/patches/3.4.87/sparc-include.patch
diff --git a/target/linux/patches/3.4.84/startup.patch b/target/linux/patches/3.4.87/startup.patch
index c26430bcb..c26430bcb 100644
--- a/target/linux/patches/3.4.84/startup.patch
+++ b/target/linux/patches/3.4.87/startup.patch
diff --git a/target/linux/patches/3.4.84/usb-defaults-off.patch b/target/linux/patches/3.4.87/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.84/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.87/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.84/uuid.patch b/target/linux/patches/3.4.87/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.84/uuid.patch
+++ b/target/linux/patches/3.4.87/uuid.patch
diff --git a/target/linux/patches/3.4.84/vga-cons-default-off.patch b/target/linux/patches/3.4.87/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.84/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.87/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.84/wlan-cf.patch b/target/linux/patches/3.4.87/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.84/wlan-cf.patch
+++ b/target/linux/patches/3.4.87/wlan-cf.patch
diff --git a/target/linux/patches/3.4.84/zlib-inflate.patch b/target/linux/patches/3.4.87/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.84/zlib-inflate.patch
+++ b/target/linux/patches/3.4.87/zlib-inflate.patch
diff --git a/toolchain/kernel-headers/patches/3.4.84/aufs2.patch b/toolchain/kernel-headers/patches/3.4.87/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.4.84/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.4.87/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.4.84/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.87/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.4.84/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.4.87/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.4.84/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.87/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.4.84/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.4.87/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.4.84/relocs.patch b/toolchain/kernel-headers/patches/3.4.87/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.4.84/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.4.87/relocs.patch