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.fsnet2
-rw-r--r--target/linux/config/Config.in.input2
-rw-r--r--target/linux/config/Config.in.netfilter.ip44
-rw-r--r--target/linux/patches/3.4.65/bsd-compatibility.patch (renamed from target/linux/patches/3.4.60/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.4.65/cris-etrax.patch (renamed from target/linux/patches/3.4.60/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.4.65/defaults.patch (renamed from target/linux/patches/3.4.60/defaults.patch)0
-rw-r--r--target/linux/patches/3.4.65/gemalto.patch (renamed from target/linux/patches/3.4.60/gemalto.patch)0
-rw-r--r--target/linux/patches/3.4.65/lemote-rfkill.patch (renamed from target/linux/patches/3.4.60/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.4.65/module-alloc-size-check.patch (renamed from target/linux/patches/3.4.60/module-alloc-size-check.patch)0
-rw-r--r--target/linux/patches/3.4.65/non-static.patch (renamed from target/linux/patches/3.4.60/non-static.patch)0
-rw-r--r--target/linux/patches/3.4.65/sparc-include.patch (renamed from target/linux/patches/3.4.60/sparc-include.patch)0
-rw-r--r--target/linux/patches/3.4.65/startup.patch (renamed from target/linux/patches/3.4.60/startup.patch)0
-rw-r--r--target/linux/patches/3.4.65/usb-defaults-off.patch (renamed from target/linux/patches/3.4.60/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.4.65/uuid.patch (renamed from target/linux/patches/3.4.60/uuid.patch)0
-rw-r--r--target/linux/patches/3.4.65/vga-cons-default-off.patch (renamed from target/linux/patches/3.4.60/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.4.65/wlan-cf.patch (renamed from target/linux/patches/3.4.60/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.4.65/zlib-inflate.patch (renamed from target/linux/patches/3.4.60/zlib-inflate.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.60/aufs2.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.4.60/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.4.60/etrax-header.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/microperl.patch (renamed from toolchain/kernel-headers/patches/3.4.60/microperl.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.4.65/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.60/relocs.patch)0
26 files changed, 11 insertions, 9 deletions
diff --git a/Config.in b/Config.in
index dcfbd9f03..ce48d0dc3 100644
--- a/Config.in
+++ b/Config.in
@@ -110,8 +110,8 @@ config ADK_KERNEL_VERSION_3_9_11
prompt "3.9.11"
boolean
-config ADK_KERNEL_VERSION_3_4_60
- prompt "3.4.60"
+config ADK_KERNEL_VERSION_3_4_65
+ prompt "3.4.65"
boolean
endchoice
@@ -119,7 +119,7 @@ endchoice
config ADK_KERNEL_VERSION
string
default "3.9.11" if ADK_KERNEL_VERSION_3_9_11
- default "3.4.60" if ADK_KERNEL_VERSION_3_4_60
+ default "3.4.65" if ADK_KERNEL_VERSION_3_4_65
help
config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 29caeae76..c631f693c 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -10,9 +10,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= edbf88eb7f7d34dbd5d3887726790755
endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_60),y)
-KERNEL_VERSION:= 3.4.60
+ifeq ($(ADK_KERNEL_VERSION_3_4_65),y)
+KERNEL_VERSION:= 3.4.65
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 6173c731d43939c133d0c575e6e0735e
+KERNEL_MD5SUM:= c1d4cbf921a74e0234006d6cd9a3ac2b
endif
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 77871f171..c22ae210c 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL
default y
config ADK_KPACKAGE_KMOD_CIFS
- prompt "kmod-fs-cifs...................... CIFS support"
+ prompt "kmod-cifs......................... CIFS support"
tristate
select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
select ADK_KERNEL_NETWORK_FILESYSTEMS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 587a7f2c9..dda525cda 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -152,12 +152,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
tristate
select ADK_KERNEL_INPUT
select ADK_KERNEL_INPUT_KEYBOARD
+ depends on !ADK_KERNEL_KEYBOARD_ATKBD
default n
config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
prompt "kmod-input-mouse................. Mouse support (PS/2)"
tristate
select ADK_KERNEL_INPUT
+ depends on !ADK_KERNEL_INPUT_MOUSEDEV
default n
config ADK_KPACKAGE_KMOD_INPUT_EVDEV
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index f8394ddd7..6cb9ef501 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_60
+ select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_65
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_4_60
+ depends on ADK_KERNEL_VERSION_3_4_65
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.60/bsd-compatibility.patch b/target/linux/patches/3.4.65/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.60/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.65/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.60/cris-etrax.patch b/target/linux/patches/3.4.65/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.4.60/cris-etrax.patch
+++ b/target/linux/patches/3.4.65/cris-etrax.patch
diff --git a/target/linux/patches/3.4.60/defaults.patch b/target/linux/patches/3.4.65/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.60/defaults.patch
+++ b/target/linux/patches/3.4.65/defaults.patch
diff --git a/target/linux/patches/3.4.60/gemalto.patch b/target/linux/patches/3.4.65/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.60/gemalto.patch
+++ b/target/linux/patches/3.4.65/gemalto.patch
diff --git a/target/linux/patches/3.4.60/lemote-rfkill.patch b/target/linux/patches/3.4.65/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.60/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.65/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.60/module-alloc-size-check.patch b/target/linux/patches/3.4.65/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.60/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.65/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.60/non-static.patch b/target/linux/patches/3.4.65/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.60/non-static.patch
+++ b/target/linux/patches/3.4.65/non-static.patch
diff --git a/target/linux/patches/3.4.60/sparc-include.patch b/target/linux/patches/3.4.65/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.60/sparc-include.patch
+++ b/target/linux/patches/3.4.65/sparc-include.patch
diff --git a/target/linux/patches/3.4.60/startup.patch b/target/linux/patches/3.4.65/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.60/startup.patch
+++ b/target/linux/patches/3.4.65/startup.patch
diff --git a/target/linux/patches/3.4.60/usb-defaults-off.patch b/target/linux/patches/3.4.65/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.60/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.65/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.60/uuid.patch b/target/linux/patches/3.4.65/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.60/uuid.patch
+++ b/target/linux/patches/3.4.65/uuid.patch
diff --git a/target/linux/patches/3.4.60/vga-cons-default-off.patch b/target/linux/patches/3.4.65/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.60/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.65/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.60/wlan-cf.patch b/target/linux/patches/3.4.65/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.60/wlan-cf.patch
+++ b/target/linux/patches/3.4.65/wlan-cf.patch
diff --git a/target/linux/patches/3.4.60/zlib-inflate.patch b/target/linux/patches/3.4.65/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.60/zlib-inflate.patch
+++ b/target/linux/patches/3.4.65/zlib-inflate.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/aufs2.patch b/toolchain/kernel-headers/patches/3.4.65/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.4.60/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.65/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.4.60/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.65/etrax-header.patch
index 559c0f322..559c0f322 100644
--- a/toolchain/kernel-headers/patches/3.4.60/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.65/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/microperl.patch b/toolchain/kernel-headers/patches/3.4.65/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.4.60/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.65/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.4.60/relocs.patch b/toolchain/kernel-headers/patches/3.4.65/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.4.60/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.4.65/relocs.patch