diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-04 15:58:44 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-04 15:58:44 +0200 |
commit | 3c20e7545c11200a09e8a37bf1929e1786a59c8b (patch) | |
tree | 531c8a90b9cc077007821ee7d0a9ecc53e438c6e | |
parent | 67d9c60997259077b183d6b7cee6fbf8ef5c57f2 (diff) |
update longterm kernel
-rw-r--r-- | Config.in | 6 | ||||
-rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 4 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/bsd-compatibility.patch (renamed from target/linux/patches/3.4.52/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/cris-etrax.patch (renamed from target/linux/patches/3.4.52/cris-etrax.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/defaults.patch (renamed from target/linux/patches/3.4.52/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/gemalto.patch (renamed from target/linux/patches/3.4.52/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/lemote-rfkill.patch (renamed from target/linux/patches/3.4.52/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/module-alloc-size-check.patch (renamed from target/linux/patches/3.4.52/module-alloc-size-check.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/non-static.patch (renamed from target/linux/patches/3.4.52/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/sparc-include.patch (renamed from target/linux/patches/3.4.52/sparc-include.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/startup.patch (renamed from target/linux/patches/3.4.52/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/usb-defaults-off.patch (renamed from target/linux/patches/3.4.52/usb-defaults-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/uuid.patch (renamed from target/linux/patches/3.4.52/uuid.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/vga-cons-default-off.patch (renamed from target/linux/patches/3.4.52/vga-cons-default-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/wlan-cf.patch (renamed from target/linux/patches/3.4.52/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.60/zlib-inflate.patch (renamed from target/linux/patches/3.4.52/zlib-inflate.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.52/aufs2.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.4.52/cleankernel.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.4.52/etrax-header.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.52/linux-gcc-check.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/microperl.patch (renamed from toolchain/kernel-headers/patches/3.4.52/microperl.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.52/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.60/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.52/relocs.patch) | 0 |
24 files changed, 8 insertions, 8 deletions
@@ -114,8 +114,8 @@ config ADK_KERNEL_VERSION_3_6_11 prompt "3.6.11" boolean -config ADK_KERNEL_VERSION_3_4_52 - prompt "3.4.52" +config ADK_KERNEL_VERSION_3_4_60 + prompt "3.4.60" boolean endchoice @@ -124,7 +124,7 @@ config ADK_KERNEL_VERSION string default "3.9.9" if ADK_KERNEL_VERSION_3_9_9 default "3.6.11" if ADK_KERNEL_VERSION_3_6_11 - default "3.4.52" if ADK_KERNEL_VERSION_3_4_52 + default "3.4.60" if ADK_KERNEL_VERSION_3_4_60 help config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 50a8cfb1b..7e7fc8724 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -16,9 +16,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 3d602ad7f7984509c3e923a5ae90bc54 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_52),y) -KERNEL_VERSION:= 3.4.52 +ifeq ($(ADK_KERNEL_VERSION_3_4_60),y) +KERNEL_VERSION:= 3.4.60 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 97411d754781f6bae5c0a6e48849b3c9 +KERNEL_MD5SUM:= 6173c731d43939c133d0c575e6e0735e endif diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 89d070c23..cb3f8e1cb 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -36,13 +36,13 @@ 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_52 + select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_60 select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_9 config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_4_52 + depends on ADK_KERNEL_VERSION_3_4_60 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.52/bsd-compatibility.patch b/target/linux/patches/3.4.60/bsd-compatibility.patch index 9e91a62de..9e91a62de 100644 --- a/target/linux/patches/3.4.52/bsd-compatibility.patch +++ b/target/linux/patches/3.4.60/bsd-compatibility.patch diff --git a/target/linux/patches/3.4.52/cris-etrax.patch b/target/linux/patches/3.4.60/cris-etrax.patch index a80d9a8b8..a80d9a8b8 100644 --- a/target/linux/patches/3.4.52/cris-etrax.patch +++ b/target/linux/patches/3.4.60/cris-etrax.patch diff --git a/target/linux/patches/3.4.52/defaults.patch b/target/linux/patches/3.4.60/defaults.patch index 58aae610b..58aae610b 100644 --- a/target/linux/patches/3.4.52/defaults.patch +++ b/target/linux/patches/3.4.60/defaults.patch diff --git a/target/linux/patches/3.4.52/gemalto.patch b/target/linux/patches/3.4.60/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.4.52/gemalto.patch +++ b/target/linux/patches/3.4.60/gemalto.patch diff --git a/target/linux/patches/3.4.52/lemote-rfkill.patch b/target/linux/patches/3.4.60/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.4.52/lemote-rfkill.patch +++ b/target/linux/patches/3.4.60/lemote-rfkill.patch diff --git a/target/linux/patches/3.4.52/module-alloc-size-check.patch b/target/linux/patches/3.4.60/module-alloc-size-check.patch index a792ac60a..a792ac60a 100644 --- a/target/linux/patches/3.4.52/module-alloc-size-check.patch +++ b/target/linux/patches/3.4.60/module-alloc-size-check.patch diff --git a/target/linux/patches/3.4.52/non-static.patch b/target/linux/patches/3.4.60/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.4.52/non-static.patch +++ b/target/linux/patches/3.4.60/non-static.patch diff --git a/target/linux/patches/3.4.52/sparc-include.patch b/target/linux/patches/3.4.60/sparc-include.patch index 2f8ffd061..2f8ffd061 100644 --- a/target/linux/patches/3.4.52/sparc-include.patch +++ b/target/linux/patches/3.4.60/sparc-include.patch diff --git a/target/linux/patches/3.4.52/startup.patch b/target/linux/patches/3.4.60/startup.patch index 68e8987b0..68e8987b0 100644 --- a/target/linux/patches/3.4.52/startup.patch +++ b/target/linux/patches/3.4.60/startup.patch diff --git a/target/linux/patches/3.4.52/usb-defaults-off.patch b/target/linux/patches/3.4.60/usb-defaults-off.patch index 31367108a..31367108a 100644 --- a/target/linux/patches/3.4.52/usb-defaults-off.patch +++ b/target/linux/patches/3.4.60/usb-defaults-off.patch diff --git a/target/linux/patches/3.4.52/uuid.patch b/target/linux/patches/3.4.60/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.4.52/uuid.patch +++ b/target/linux/patches/3.4.60/uuid.patch diff --git a/target/linux/patches/3.4.52/vga-cons-default-off.patch b/target/linux/patches/3.4.60/vga-cons-default-off.patch index 178aeeeb9..178aeeeb9 100644 --- a/target/linux/patches/3.4.52/vga-cons-default-off.patch +++ b/target/linux/patches/3.4.60/vga-cons-default-off.patch diff --git a/target/linux/patches/3.4.52/wlan-cf.patch b/target/linux/patches/3.4.60/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.4.52/wlan-cf.patch +++ b/target/linux/patches/3.4.60/wlan-cf.patch diff --git a/target/linux/patches/3.4.52/zlib-inflate.patch b/target/linux/patches/3.4.60/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.4.52/zlib-inflate.patch +++ b/target/linux/patches/3.4.60/zlib-inflate.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/aufs2.patch b/toolchain/kernel-headers/patches/3.4.60/aufs2.patch index d40c9a3fe..d40c9a3fe 100644 --- a/toolchain/kernel-headers/patches/3.4.52/aufs2.patch +++ b/toolchain/kernel-headers/patches/3.4.60/aufs2.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.60/cleankernel.patch index f8d5448ee..f8d5448ee 100644 --- a/toolchain/kernel-headers/patches/3.4.52/cleankernel.patch +++ b/toolchain/kernel-headers/patches/3.4.60/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.60/etrax-header.patch index 559c0f322..559c0f322 100644 --- a/toolchain/kernel-headers/patches/3.4.52/etrax-header.patch +++ b/toolchain/kernel-headers/patches/3.4.60/etrax-header.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch index 7cc381845..7cc381845 100644 --- a/toolchain/kernel-headers/patches/3.4.52/linux-gcc-check.patch +++ b/toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/microperl.patch b/toolchain/kernel-headers/patches/3.4.60/microperl.patch index 44c39f6e8..44c39f6e8 100644 --- a/toolchain/kernel-headers/patches/3.4.52/microperl.patch +++ b/toolchain/kernel-headers/patches/3.4.60/microperl.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.4.52/mkpiggy.patch +++ b/toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.4.52/relocs.patch b/toolchain/kernel-headers/patches/3.4.60/relocs.patch index 43c5bb580..43c5bb580 100644 --- a/toolchain/kernel-headers/patches/3.4.52/relocs.patch +++ b/toolchain/kernel-headers/patches/3.4.60/relocs.patch |