Browse Source

update 3.10 kernel

Waldemar Brodkorb 11 years ago
parent
commit
d5bcfc9feb

+ 3 - 3
Config.in

@@ -123,8 +123,8 @@ config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_10_36
-	prompt "3.10.36"
+config ADK_KERNEL_VERSION_3_10_37
+	prompt "3.10.37"
 	boolean
 
 config ADK_KERNEL_VERSION_3_4_84
@@ -140,7 +140,7 @@ config ADK_KERNEL_VERSION
 	default "3.13.11" if ADK_KERNEL_VERSION_3_13_11
 	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.36" if ADK_KERNEL_VERSION_3_10_36
+	default "3.10.37" if ADK_KERNEL_VERSION_3_10_37
 	default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
 	help
 

+ 3 - 3
mk/kernel-ver.mk

@@ -28,11 +28,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_36),y)
-KERNEL_VERSION:=	3.10.36
+ifeq ($(ADK_KERNEL_VERSION_3_10_37),y)
+KERNEL_VERSION:=	3.10.37
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		721f76050755ec8ec88876ee350a2726
+KERNEL_MD5SUM:=		a08a10ffc31b07d9422af1cd2baa3274
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
 KERNEL_VERSION:=	3.4.84

+ 0 - 0
target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch → target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch


File diff suppressed because it is too large
+ 238 - 235
target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch


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

@@ -37,7 +37,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_IPV4 if ADK_KERNEL_VERSION_3_10_36
+	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
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11
@@ -55,7 +55,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_10_36 \
+	depends on ADK_KERNEL_VERSION_3_10_37 \
 		|| ADK_KERNEL_VERSION_3_11_10 \
 		|| ADK_KERNEL_VERSION_3_12_18 \
 		|| ADK_KERNEL_VERSION_3_13_11 \

+ 0 - 0
target/linux/patches/3.10.36/bsd-compatibility.patch → target/linux/patches/3.10.37/bsd-compatibility.patch


+ 0 - 0
target/linux/patches/3.10.36/startup.patch → target/linux/patches/3.10.37/startup.patch


+ 0 - 91
toolchain/kernel-headers/patches/3.10.36/headers-install.patch

@@ -1,91 +0,0 @@
-diff -Nur linux-3.10.36.orig/scripts/headers_install.sh linux-3.10.36/scripts/headers_install.sh
---- linux-3.10.36.orig/scripts/headers_install.sh	2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/scripts/headers_install.sh	2014-04-14 20:32:34.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- if [ $# -lt 1 ]
- then
--	echo "Usage: headers_install.sh OUTDIR [FILES...]
-+	echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]
- 	echo
- 	echo "Prepares kernel header files for use by user space, by removing"
- 	echo "all compiler.h definitions and #includes, removing any"
-@@ -10,6 +10,7 @@
- 	echo "asm/inline/volatile keywords."
- 	echo
- 	echo "OUTDIR: directory to write each userspace header FILE to."
-+	echo "SRCDIR: source directory where files are picked."
- 	echo "FILES:  list of header files to operate on."
- 
- 	exit 1
-@@ -19,6 +20,8 @@
- 
- OUTDIR="$1"
- shift
-+SRCDIR="$1"
-+shift
- 
- # Iterate through files listed on command line
- 
-@@ -34,7 +37,7 @@
- 		-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
- 		-e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
- 		-e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
--		"$i" > "$OUTDIR/$FILE.sed" || exit 1
-+		"$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
- 	scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
- 		> "$OUTDIR/$FILE"
- 	[ $? -gt 1 ] && exit 1
-diff -Nur linux-3.10.36.orig/scripts/Makefile.headersinst linux-3.10.36/scripts/Makefile.headersinst
---- linux-3.10.36.orig/scripts/Makefile.headersinst	2014-04-03 21:01:22.000000000 +0200
-+++ linux-3.10.36/scripts/Makefile.headersinst	2014-04-14 20:42:47.000000000 +0200
-@@ -47,18 +47,24 @@
- all-files     := $(header-y) $(genhdr-y) $(wrapper-files)
- output-files  := $(addprefix $(installdir)/, $(all-files))
- 
--input-files   := $(foreach hdr, $(header-y), \
-+input-files1  := $(foreach hdr, $(header-y), \
- 		   $(if $(wildcard $(srcdir)/$(hdr)), \
--			$(wildcard $(srcdir)/$(hdr)), \
-+			$(wildcard $(srcdir)/$(hdr))) \
-+		   )
-+input-files1-name := $(notdir $(input-files1))
-+input-files2  := $(foreach hdr, $(header-y), \
-+		   $(if  $(wildcard $(srcdir)/$(hdr)),, \
- 			$(if $(wildcard $(oldsrcdir)/$(hdr)), \
- 				$(wildcard $(oldsrcdir)/$(hdr)), \
- 				$(error Missing UAPI file $(srcdir)/$(hdr))) \
--		   )) \
--		 $(foreach hdr, $(genhdr-y), \
-+		   ))
-+input-files2-name := $(notdir $(input-files2))
-+input-files3  := $(foreach hdr, $(genhdr-y), \
- 		   $(if	$(wildcard $(gendir)/$(hdr)), \
- 			$(wildcard $(gendir)/$(hdr)), \
- 			$(error Missing generated UAPI file $(gendir)/$(hdr)) \
- 		   ))
-+input-files3-name := $(notdir $(input-files3))
- 
- # Work out what needs to be removed
- oldheaders    := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
-@@ -72,7 +78,9 @@
- quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
-                             file$(if $(word 2, $(all-files)),s))
-       cmd_install = \
--        $(CONFIG_SHELL) $< $(installdir) $(input-files); \
-+        $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
-+        $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
-+        $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
-         for F in $(wrapper-files); do                                   \
-                 echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;    \
-         done;                                                           \
-@@ -98,8 +106,7 @@
- 	@:
- 
- targets += $(install-file)
--$(install-file): scripts/headers_install.sh $(input-files) FORCE
--	$(if $(unwanted),$(call cmd,remove),)
-+$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
- 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- 	$(call if_changed,install)
- 

+ 11 - 0
toolchain/kernel-headers/patches/3.10.37/headers-install.patch

@@ -0,0 +1,11 @@
+diff -Nur linux-3.10.37.orig/scripts/Makefile.headersinst linux-3.10.37/scripts/Makefile.headersinst
+--- linux-3.10.37.orig/scripts/Makefile.headersinst	2014-04-14 15:42:31.000000000 +0200
++++ linux-3.10.37/scripts/Makefile.headersinst	2014-04-24 17:04:51.980248954 +0200
+@@ -107,7 +107,6 @@
+ 
+ targets += $(install-file)
+ $(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
+-	$(if $(unwanted),$(call cmd,remove),)
+ 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
+ 	$(call if_changed,install)
+ 

+ 0 - 0
toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch → toolchain/kernel-headers/patches/3.10.37/mkpiggy.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.10.36/relocs.patch → toolchain/kernel-headers/patches/3.10.37/relocs.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.10.36/sgidefs.patch → toolchain/kernel-headers/patches/3.10.37/sgidefs.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.10.36/sortext.patch → toolchain/kernel-headers/patches/3.10.37/sortext.patch


Some files were not shown because too many files changed in this diff