Browse Source

update to latest 3.4 kernel

Waldemar Brodkorb 12 years ago
parent
commit
76c1916cac

+ 3 - 3
Config.in

@@ -110,8 +110,8 @@ config ADK_KERNEL_VERSION_3_9_11
 	prompt "3.9.11"
 	prompt "3.9.11"
 	boolean
 	boolean
 
 
-config ADK_KERNEL_VERSION_3_4_60
-	prompt "3.4.60"
+config ADK_KERNEL_VERSION_3_4_65
+	prompt "3.4.65"
 	boolean
 	boolean
 
 
 endchoice
 endchoice
@@ -119,7 +119,7 @@ endchoice
 config ADK_KERNEL_VERSION
 config ADK_KERNEL_VERSION
 	string
 	string
 	default "3.9.11" if ADK_KERNEL_VERSION_3_9_11
 	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
 	help
 
 
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI

+ 3 - 3
mk/kernel-ver.mk

@@ -10,9 +10,9 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		edbf88eb7f7d34dbd5d3887726790755
 KERNEL_MD5SUM:=		edbf88eb7f7d34dbd5d3887726790755
 endif
 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_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		6173c731d43939c133d0c575e6e0735e
+KERNEL_MD5SUM:=		c1d4cbf921a74e0234006d6cd9a3ac2b
 endif
 endif

+ 1 - 1
target/linux/config/Config.in.fsnet

@@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL
 	default y
 	default y
 
 
 config ADK_KPACKAGE_KMOD_CIFS
 config ADK_KPACKAGE_KMOD_CIFS
-	prompt "kmod-fs-cifs...................... CIFS support"
+	prompt "kmod-cifs......................... CIFS support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS

+ 2 - 0
target/linux/config/Config.in.input

@@ -152,12 +152,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	tristate
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_INPUT_KEYBOARD
+	depends on !ADK_KERNEL_KEYBOARD_ATKBD
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
 	prompt "kmod-input-mouse................. Mouse support (PS/2)"
 	prompt "kmod-input-mouse................. Mouse support (PS/2)"
 	tristate
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT
+	depends on !ADK_KERNEL_INPUT_MOUSEDEV
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV

+ 2 - 2
target/linux/config/Config.in.netfilter.ip4

@@ -36,13 +36,13 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 
 config ADK_KPACKAGE_KMOD_FULL_NAT
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for 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
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11
 
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
 	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
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
 	  forms of full Network Address Port Translation.  It is controlled by

+ 0 - 0
target/linux/patches/3.4.60/bsd-compatibility.patch → target/linux/patches/3.4.65/bsd-compatibility.patch


+ 0 - 0
target/linux/patches/3.4.60/cris-etrax.patch → target/linux/patches/3.4.65/cris-etrax.patch


+ 0 - 0
target/linux/patches/3.4.60/defaults.patch → target/linux/patches/3.4.65/defaults.patch


+ 0 - 0
target/linux/patches/3.4.60/gemalto.patch → target/linux/patches/3.4.65/gemalto.patch


+ 0 - 0
target/linux/patches/3.4.60/lemote-rfkill.patch → target/linux/patches/3.4.65/lemote-rfkill.patch


+ 0 - 0
target/linux/patches/3.4.60/module-alloc-size-check.patch → target/linux/patches/3.4.65/module-alloc-size-check.patch


+ 0 - 0
target/linux/patches/3.4.60/non-static.patch → target/linux/patches/3.4.65/non-static.patch


+ 0 - 0
target/linux/patches/3.4.60/sparc-include.patch → target/linux/patches/3.4.65/sparc-include.patch


+ 0 - 0
target/linux/patches/3.4.60/startup.patch → target/linux/patches/3.4.65/startup.patch


+ 0 - 0
target/linux/patches/3.4.60/usb-defaults-off.patch → target/linux/patches/3.4.65/usb-defaults-off.patch


+ 0 - 0
target/linux/patches/3.4.60/uuid.patch → target/linux/patches/3.4.65/uuid.patch


+ 0 - 0
target/linux/patches/3.4.60/vga-cons-default-off.patch → target/linux/patches/3.4.65/vga-cons-default-off.patch


+ 0 - 0
target/linux/patches/3.4.60/wlan-cf.patch → target/linux/patches/3.4.65/wlan-cf.patch


+ 0 - 0
target/linux/patches/3.4.60/zlib-inflate.patch → target/linux/patches/3.4.65/zlib-inflate.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/aufs2.patch → toolchain/kernel-headers/patches/3.4.65/aufs2.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/cleankernel.patch → toolchain/kernel-headers/patches/3.4.65/cleankernel.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/etrax-header.patch → toolchain/kernel-headers/patches/3.4.65/etrax-header.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/linux-gcc-check.patch → toolchain/kernel-headers/patches/3.4.65/linux-gcc-check.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/microperl.patch → toolchain/kernel-headers/patches/3.4.65/microperl.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/mkpiggy.patch → toolchain/kernel-headers/patches/3.4.65/mkpiggy.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.4.60/relocs.patch → toolchain/kernel-headers/patches/3.4.65/relocs.patch