diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-08-24 10:45:01 +0200 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-08-24 10:45:01 +0200 |
commit | 531c803bf1a776a91feb49917fd85cf6923887b3 (patch) | |
tree | a42f1baf60373feb78b87326ec05ff5dcb70dfa9 | |
parent | 7e441f6ea56f6647a0ac599591e271fbe1c5dc23 (diff) |
update to latest stable kernel version
-rw-r--r-- | Config.in | 14 | ||||
-rw-r--r-- | mk/kernel-ver.mk | 18 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/bsd-compatibility.patch (renamed from target/linux/patches/3.4.6/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/cris-etrax.patch (renamed from target/linux/patches/3.4.6/cris-etrax.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/defaults.patch (renamed from target/linux/patches/3.4.6/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/gemalto.patch (renamed from target/linux/patches/3.4.6/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/lemote-rfkill.patch (renamed from target/linux/patches/3.4.6/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/mmc-host.patch (renamed from target/linux/patches/3.4.6/mmc-host.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/module-alloc-size-check.patch (renamed from target/linux/patches/3.4.6/module-alloc-size-check.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/non-static.patch (renamed from target/linux/patches/3.4.6/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/sparc-include.patch (renamed from target/linux/patches/3.4.6/sparc-include.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/startup.patch (renamed from target/linux/patches/3.4.6/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/usb-defaults-off.patch (renamed from target/linux/patches/3.4.6/usb-defaults-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/uuid.patch (renamed from target/linux/patches/3.4.6/uuid.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/vga-cons-default-off.patch (renamed from target/linux/patches/3.4.6/vga-cons-default-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/wlan-cf.patch (renamed from target/linux/patches/3.4.6/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.4.9/zlib-inflate.patch (renamed from target/linux/patches/3.4.6/zlib-inflate.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/brcm.patch (renamed from target/linux/patches/3.5/brcm.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/bsd-compatibility.patch (renamed from target/linux/patches/3.5/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/cris-etrax.patch (renamed from target/linux/patches/3.5/cris-etrax.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/defaults.patch (renamed from target/linux/patches/3.5/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/gemalto.patch (renamed from target/linux/patches/3.5/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/lemote-rfkill.patch (renamed from target/linux/patches/3.5/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/mmc-host.patch (renamed from target/linux/patches/3.5/mmc-host.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/module-alloc-size-check.patch (renamed from target/linux/patches/3.5/module-alloc-size-check.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/mtd-rootfs.patch (renamed from target/linux/patches/3.5/mtd-rootfs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/non-static.patch (renamed from target/linux/patches/3.5/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/startup.patch (renamed from target/linux/patches/3.5/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/usb-defaults-off.patch (renamed from target/linux/patches/3.5/usb-defaults-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/uuid.patch (renamed from target/linux/patches/3.5/uuid.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/vga-cons-default-off.patch (renamed from target/linux/patches/3.5/vga-cons-default-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/wlan-cf.patch (renamed from target/linux/patches/3.5/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5.2/zlib-inflate.patch (renamed from target/linux/patches/3.5/zlib-inflate.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.5/mips-sort-darwin.patch | 11 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/2.6.39.4/aufs2.patch | 240 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/2.6.39.4/etrax-header.patch | 75 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/2.6.39.4/microperl.patch | 24 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.6/aufs2.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/cleankernel.patch (renamed from toolchain/kernel-headers/patches/2.6.39.4/cleankernel.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.4.6/etrax-header.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/2.6.39.4/linux-gcc-check.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/microperl.patch (renamed from toolchain/kernel-headers/patches/3.4.6/microperl.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.6/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.4.9/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.6/relocs.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.5/aufs2.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.4.6/cleankernel.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.5/etrax-header.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.6/linux-gcc-check.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/microperl.patch (renamed from toolchain/kernel-headers/patches/3.5/microperl.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.5/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/relocs.patch (renamed from toolchain/kernel-headers/patches/3.5/relocs.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5.2/sortext.patch | 22 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5/cleankernel.patch | 11 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.5/linux-gcc-check.patch | 18 |
54 files changed, 38 insertions, 395 deletions
@@ -95,7 +95,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.4.6" + prompt "3.4.9" boolean depends on ADK_TOOLCHAIN_ONLY @@ -107,19 +107,19 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_4_6 - prompt "3.4.6" +config ADK_KERNEL_VERSION_3_4_9 + prompt "3.4.9" boolean -config ADK_KERNEL_VERSION_3_5 - prompt "3.5" +config ADK_KERNEL_VERSION_3_5_2 + prompt "3.5.2" boolean endchoice config ADK_KERNEL_VERSION string - default "3.4.6" if ADK_KERNEL_VERSION_3_4_6 - default "3.5" if ADK_KERNEL_VERSION_3_5 + default "3.4.9" if ADK_KERNEL_VERSION_3_4_9 + default "3.5.2" if ADK_KERNEL_VERSION_3_5_2 help choice diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 1d8740db1..cb860fc86 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,18 +1,18 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.4.6 +KERNEL_VERSION:= 3.4.9 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= e81d235d91289e612f48718b459b9039 +KERNEL_MD5SUM:= 0428dcd244b494e99da9a314667c6f99 endif -ifeq ($(ADK_KERNEL_VERSION_3_5),y) -KERNEL_VERSION:= 3.5 -KERNEL_MOD_VERSION:= 3.5.0 +ifeq ($(ADK_KERNEL_VERSION_3_5_2),y) +KERNEL_VERSION:= 3.5.2 +KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 3ed693d5dee4f4aa05e15d3c19f6cf01 +KERNEL_MD5SUM:= f0341109ba14a8f9f455c131ccc8ddd3 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_6),y) -KERNEL_VERSION:= 3.4.6 +ifeq ($(ADK_KERNEL_VERSION_3_4_9),y) +KERNEL_VERSION:= 3.4.9 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= e81d235d91289e612f48718b459b9039 +KERNEL_MD5SUM:= 0428dcd244b494e99da9a314667c6f99 endif diff --git a/target/linux/patches/3.4.6/bsd-compatibility.patch b/target/linux/patches/3.4.9/bsd-compatibility.patch index 9e91a62de..9e91a62de 100644 --- a/target/linux/patches/3.4.6/bsd-compatibility.patch +++ b/target/linux/patches/3.4.9/bsd-compatibility.patch diff --git a/target/linux/patches/3.4.6/cris-etrax.patch b/target/linux/patches/3.4.9/cris-etrax.patch index a80d9a8b8..a80d9a8b8 100644 --- a/target/linux/patches/3.4.6/cris-etrax.patch +++ b/target/linux/patches/3.4.9/cris-etrax.patch diff --git a/target/linux/patches/3.4.6/defaults.patch b/target/linux/patches/3.4.9/defaults.patch index 58aae610b..58aae610b 100644 --- a/target/linux/patches/3.4.6/defaults.patch +++ b/target/linux/patches/3.4.9/defaults.patch diff --git a/target/linux/patches/3.4.6/gemalto.patch b/target/linux/patches/3.4.9/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.4.6/gemalto.patch +++ b/target/linux/patches/3.4.9/gemalto.patch diff --git a/target/linux/patches/3.4.6/lemote-rfkill.patch b/target/linux/patches/3.4.9/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.4.6/lemote-rfkill.patch +++ b/target/linux/patches/3.4.9/lemote-rfkill.patch diff --git a/target/linux/patches/3.4.6/mmc-host.patch b/target/linux/patches/3.4.9/mmc-host.patch index 3d0e37add..3d0e37add 100644 --- a/target/linux/patches/3.4.6/mmc-host.patch +++ b/target/linux/patches/3.4.9/mmc-host.patch diff --git a/target/linux/patches/3.4.6/module-alloc-size-check.patch b/target/linux/patches/3.4.9/module-alloc-size-check.patch index a792ac60a..a792ac60a 100644 --- a/target/linux/patches/3.4.6/module-alloc-size-check.patch +++ b/target/linux/patches/3.4.9/module-alloc-size-check.patch diff --git a/target/linux/patches/3.4.6/non-static.patch b/target/linux/patches/3.4.9/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.4.6/non-static.patch +++ b/target/linux/patches/3.4.9/non-static.patch diff --git a/target/linux/patches/3.4.6/sparc-include.patch b/target/linux/patches/3.4.9/sparc-include.patch index 2f8ffd061..2f8ffd061 100644 --- a/target/linux/patches/3.4.6/sparc-include.patch +++ b/target/linux/patches/3.4.9/sparc-include.patch diff --git a/target/linux/patches/3.4.6/startup.patch b/target/linux/patches/3.4.9/startup.patch index 68e8987b0..68e8987b0 100644 --- a/target/linux/patches/3.4.6/startup.patch +++ b/target/linux/patches/3.4.9/startup.patch diff --git a/target/linux/patches/3.4.6/usb-defaults-off.patch b/target/linux/patches/3.4.9/usb-defaults-off.patch index 31367108a..31367108a 100644 --- a/target/linux/patches/3.4.6/usb-defaults-off.patch +++ b/target/linux/patches/3.4.9/usb-defaults-off.patch diff --git a/target/linux/patches/3.4.6/uuid.patch b/target/linux/patches/3.4.9/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.4.6/uuid.patch +++ b/target/linux/patches/3.4.9/uuid.patch diff --git a/target/linux/patches/3.4.6/vga-cons-default-off.patch b/target/linux/patches/3.4.9/vga-cons-default-off.patch index 178aeeeb9..178aeeeb9 100644 --- a/target/linux/patches/3.4.6/vga-cons-default-off.patch +++ b/target/linux/patches/3.4.9/vga-cons-default-off.patch diff --git a/target/linux/patches/3.4.6/wlan-cf.patch b/target/linux/patches/3.4.9/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.4.6/wlan-cf.patch +++ b/target/linux/patches/3.4.9/wlan-cf.patch diff --git a/target/linux/patches/3.4.6/zlib-inflate.patch b/target/linux/patches/3.4.9/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.4.6/zlib-inflate.patch +++ b/target/linux/patches/3.4.9/zlib-inflate.patch diff --git a/target/linux/patches/3.5/brcm.patch b/target/linux/patches/3.5.2/brcm.patch index a94b2302d..a94b2302d 100644 --- a/target/linux/patches/3.5/brcm.patch +++ b/target/linux/patches/3.5.2/brcm.patch diff --git a/target/linux/patches/3.5/bsd-compatibility.patch b/target/linux/patches/3.5.2/bsd-compatibility.patch index 9e91a62de..9e91a62de 100644 --- a/target/linux/patches/3.5/bsd-compatibility.patch +++ b/target/linux/patches/3.5.2/bsd-compatibility.patch diff --git a/target/linux/patches/3.5/cris-etrax.patch b/target/linux/patches/3.5.2/cris-etrax.patch index a80d9a8b8..a80d9a8b8 100644 --- a/target/linux/patches/3.5/cris-etrax.patch +++ b/target/linux/patches/3.5.2/cris-etrax.patch diff --git a/target/linux/patches/3.5/defaults.patch b/target/linux/patches/3.5.2/defaults.patch index 58aae610b..58aae610b 100644 --- a/target/linux/patches/3.5/defaults.patch +++ b/target/linux/patches/3.5.2/defaults.patch diff --git a/target/linux/patches/3.5/gemalto.patch b/target/linux/patches/3.5.2/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.5/gemalto.patch +++ b/target/linux/patches/3.5.2/gemalto.patch diff --git a/target/linux/patches/3.5/lemote-rfkill.patch b/target/linux/patches/3.5.2/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.5/lemote-rfkill.patch +++ b/target/linux/patches/3.5.2/lemote-rfkill.patch diff --git a/target/linux/patches/3.5/mmc-host.patch b/target/linux/patches/3.5.2/mmc-host.patch index 3d0e37add..3d0e37add 100644 --- a/target/linux/patches/3.5/mmc-host.patch +++ b/target/linux/patches/3.5.2/mmc-host.patch diff --git a/target/linux/patches/3.5/module-alloc-size-check.patch b/target/linux/patches/3.5.2/module-alloc-size-check.patch index a792ac60a..a792ac60a 100644 --- a/target/linux/patches/3.5/module-alloc-size-check.patch +++ b/target/linux/patches/3.5.2/module-alloc-size-check.patch diff --git a/target/linux/patches/3.5/mtd-rootfs.patch b/target/linux/patches/3.5.2/mtd-rootfs.patch index 775d5fc80..775d5fc80 100644 --- a/target/linux/patches/3.5/mtd-rootfs.patch +++ b/target/linux/patches/3.5.2/mtd-rootfs.patch diff --git a/target/linux/patches/3.5/non-static.patch b/target/linux/patches/3.5.2/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.5/non-static.patch +++ b/target/linux/patches/3.5.2/non-static.patch diff --git a/target/linux/patches/3.5/startup.patch b/target/linux/patches/3.5.2/startup.patch index 68e8987b0..68e8987b0 100644 --- a/target/linux/patches/3.5/startup.patch +++ b/target/linux/patches/3.5.2/startup.patch diff --git a/target/linux/patches/3.5/usb-defaults-off.patch b/target/linux/patches/3.5.2/usb-defaults-off.patch index 54dff2bd4..54dff2bd4 100644 --- a/target/linux/patches/3.5/usb-defaults-off.patch +++ b/target/linux/patches/3.5.2/usb-defaults-off.patch diff --git a/target/linux/patches/3.5/uuid.patch b/target/linux/patches/3.5.2/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.5/uuid.patch +++ b/target/linux/patches/3.5.2/uuid.patch diff --git a/target/linux/patches/3.5/vga-cons-default-off.patch b/target/linux/patches/3.5.2/vga-cons-default-off.patch index 178aeeeb9..178aeeeb9 100644 --- a/target/linux/patches/3.5/vga-cons-default-off.patch +++ b/target/linux/patches/3.5.2/vga-cons-default-off.patch diff --git a/target/linux/patches/3.5/wlan-cf.patch b/target/linux/patches/3.5.2/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.5/wlan-cf.patch +++ b/target/linux/patches/3.5.2/wlan-cf.patch diff --git a/target/linux/patches/3.5/zlib-inflate.patch b/target/linux/patches/3.5.2/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.5/zlib-inflate.patch +++ b/target/linux/patches/3.5.2/zlib-inflate.patch diff --git a/target/linux/patches/3.5/mips-sort-darwin.patch b/target/linux/patches/3.5/mips-sort-darwin.patch deleted file mode 100644 index 25a834bb4..000000000 --- a/target/linux/patches/3.5/mips-sort-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-3.5.orig/arch/mips/Kconfig linux-3.5/arch/mips/Kconfig ---- linux-3.5.orig/arch/mips/Kconfig 2012-07-21 22:58:29.000000000 +0200 -+++ linux-3.5/arch/mips/Kconfig 2012-07-30 12:00:26.000000000 +0200 -@@ -31,7 +31,6 @@ - select HAVE_MEMBLOCK_NODE_MAP - select ARCH_DISCARD_MEMBLOCK - select GENERIC_SMP_IDLE_THREAD -- select BUILDTIME_EXTABLE_SORT - select GENERIC_CLOCKEVENTS - select GENERIC_CMOS_UPDATE - diff --git a/toolchain/kernel-headers/patches/2.6.39.4/aufs2.patch b/toolchain/kernel-headers/patches/2.6.39.4/aufs2.patch deleted file mode 100644 index eafbe6814..000000000 --- a/toolchain/kernel-headers/patches/2.6.39.4/aufs2.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -Nur linux-2.6.36.orig/include/linux/Kbuild linux-2.6.36/include/linux/Kbuild ---- linux-2.6.36.orig/include/linux/Kbuild 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/include/linux/Kbuild 2011-01-10 19:52:38.000000000 +0100 -@@ -60,6 +60,7 @@ - header-y += atmsap.h - header-y += atmsvc.h - header-y += audit.h -+header-y += aufs_type.h - header-y += auto_fs.h - header-y += auto_fs4.h - header-y += auxvec.h -diff -Nur linux-2.6.36.orig/include/linux/aufs_type.h linux-2.6.36/include/linux/aufs_type.h ---- linux-2.6.36.orig/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36/include/linux/aufs_type.h 2011-01-10 19:54:22.000000000 +0100 -@@ -0,0 +1,197 @@ -+/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima -+ * -+ * This program, aufs is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifndef __AUFS_TYPE_H__ -+#define __AUFS_TYPE_H__ -+ -+#include <linux/ioctl.h> -+#include <linux/kernel.h> -+#include <linux/limits.h> -+#include <linux/types.h> -+ -+#define AUFS_VERSION "2.1-standalone.tree-36-20110110" -+ -+/* todo? move this to linux-2.6.19/include/magic.h */ -+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') -+ -+/* ---------------------------------------------------------------------- */ -+ -+#ifdef CONFIG_AUFS_BRANCH_MAX_127 -+typedef __s8 aufs_bindex_t; -+#define AUFS_BRANCH_MAX 127 -+#else -+typedef __s16 aufs_bindex_t; -+#ifdef CONFIG_AUFS_BRANCH_MAX_511 -+#define AUFS_BRANCH_MAX 511 -+#elif defined(CONFIG_AUFS_BRANCH_MAX_1023) -+#define AUFS_BRANCH_MAX 1023 -+#elif defined(CONFIG_AUFS_BRANCH_MAX_32767) -+#define AUFS_BRANCH_MAX 32767 -+#endif -+#endif -+ -+#ifdef __KERNEL__ -+#ifndef AUFS_BRANCH_MAX -+#error unknown CONFIG_AUFS_BRANCH_MAX value -+#endif -+#endif /* __KERNEL__ */ -+ -+/* ---------------------------------------------------------------------- */ -+ -+#define AUFS_NAME "aufs" -+#define AUFS_FSTYPE AUFS_NAME -+ -+#define AUFS_ROOT_INO 2 -+#define AUFS_FIRST_INO 11 -+ -+#define AUFS_WH_PFX ".wh." -+#define AUFS_WH_PFX_LEN ((int)sizeof(AUFS_WH_PFX) - 1) -+#define AUFS_WH_TMP_LEN 4 -+/* a limit for rmdir/rename a dir */ -+#define AUFS_MAX_NAMELEN (NAME_MAX \ -+ - AUFS_WH_PFX_LEN * 2 /* doubly whiteouted */\ -+ - 1 /* dot */\ -+ - AUFS_WH_TMP_LEN) /* hex */ -+#define AUFS_XINO_FNAME "." AUFS_NAME ".xino" -+#define AUFS_XINO_DEFPATH "/tmp/" AUFS_XINO_FNAME -+#define AUFS_XINO_TRUNC_INIT 64 /* blocks */ -+#define AUFS_XINO_TRUNC_STEP 4 /* blocks */ -+#define AUFS_DIRWH_DEF 3 -+#define AUFS_RDCACHE_DEF 10 /* seconds */ -+#define AUFS_RDCACHE_MAX 3600 /* seconds */ -+#define AUFS_RDBLK_DEF 512 /* bytes */ -+#define AUFS_RDHASH_DEF 32 -+#define AUFS_WKQ_NAME AUFS_NAME "d" -+#define AUFS_WKQ_PRE_NAME AUFS_WKQ_NAME "_pre" -+#define AUFS_MFS_DEF_SEC 30 /* seconds */ -+#define AUFS_MFS_MAX_SEC 3600 /* seconds */ -+#define AUFS_PLINK_WARN 100 /* number of plinks */ -+ -+/* pseudo-link maintenace under /proc */ -+#define AUFS_PLINK_MAINT_NAME "plink_maint" -+#define AUFS_PLINK_MAINT_DIR "fs/" AUFS_NAME -+#define AUFS_PLINK_MAINT_PATH AUFS_PLINK_MAINT_DIR "/" AUFS_PLINK_MAINT_NAME -+ -+#define AUFS_DIROPQ_NAME AUFS_WH_PFX ".opq" /* whiteouted doubly */ -+#define AUFS_WH_DIROPQ AUFS_WH_PFX AUFS_DIROPQ_NAME -+ -+#define AUFS_BASE_NAME AUFS_WH_PFX AUFS_NAME -+#define AUFS_PLINKDIR_NAME AUFS_WH_PFX "plnk" -+#define AUFS_ORPHDIR_NAME AUFS_WH_PFX "orph" -+ -+/* doubly whiteouted */ -+#define AUFS_WH_BASE AUFS_WH_PFX AUFS_BASE_NAME -+#define AUFS_WH_PLINKDIR AUFS_WH_PFX AUFS_PLINKDIR_NAME -+#define AUFS_WH_ORPHDIR AUFS_WH_PFX AUFS_ORPHDIR_NAME -+ -+/* branch permission */ -+#define AUFS_BRPERM_RW "rw" -+#define AUFS_BRPERM_RO "ro" -+#define AUFS_BRPERM_RR "rr" -+#define AUFS_BRPERM_WH "wh" -+#define AUFS_BRPERM_NLWH "nolwh" -+#define AUFS_BRPERM_ROWH AUFS_BRPERM_RO "+" AUFS_BRPERM_WH -+#define AUFS_BRPERM_RRWH AUFS_BRPERM_RR "+" AUFS_BRPERM_WH -+#define AUFS_BRPERM_RWNLWH AUFS_BRPERM_RW "+" AUFS_BRPERM_NLWH -+ -+/* ---------------------------------------------------------------------- */ -+ -+/* ioctl */ -+enum { -+ /* readdir in userspace */ -+ AuCtl_RDU, -+ AuCtl_RDU_INO, -+ -+ /* pathconf wrapper */ -+ AuCtl_WBR_FD -+}; -+ -+/* borrowed from linux/include/linux/kernel.h */ -+#ifndef ALIGN -+#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) -+#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) -+#endif -+ -+/* borrowed from linux/include/linux/compiler-gcc3.h */ -+#ifndef __aligned -+#define __aligned(x) __attribute__((aligned(x))) -+#define __packed __attribute__((packed)) -+#endif -+ -+struct au_rdu_cookie { -+ __u64 h_pos; -+ __s16 bindex; -+ __u8 flags; -+ __u8 pad; -+ __u32 generation; -+} __aligned(8); -+ -+struct au_rdu_ent { -+ __u64 ino; -+ __s16 bindex; -+ __u8 type; -+ __u8 nlen; -+ __u8 wh; -+ char name[0]; -+} __aligned(8); -+ -+static inline int au_rdu_len(int nlen) -+{ -+ /* include the terminating NULL */ -+ return ALIGN(sizeof(struct au_rdu_ent) + nlen + 1, -+ sizeof(__u64)); -+} -+ -+union au_rdu_ent_ul { -+ struct au_rdu_ent __user *e; -+ __u64 ul; -+}; -+ -+enum { -+ AufsCtlRduV_SZ, -+ AufsCtlRduV_End -+}; -+ -+struct aufs_rdu { -+ /* input */ -+ union { -+ __u64 sz; /* AuCtl_RDU */ -+ __u64 nent; /* AuCtl_RDU_INO */ -+ }; -+ union au_rdu_ent_ul ent; -+ __u16 verify[AufsCtlRduV_End]; -+ -+ /* input/output */ -+ __u32 blk; -+ -+ /* output */ -+ union au_rdu_ent_ul tail; -+ /* number of entries which were added in a single call */ -+ __u64 rent; -+ __u8 full; -+ __u8 shwh; -+ -+ struct au_rdu_cookie cookie; -+} __aligned(8); -+ -+#define AuCtlType 'A' -+#define AUFS_CTL_RDU _IOWR(AuCtlType, AuCtl_RDU, struct aufs_rdu) -+#define AUFS_CTL_RDU_INO _IOWR(AuCtlType, AuCtl_RDU_INO, struct aufs_rdu) -+#define AUFS_CTL_WBR_FD _IO(AuCtlType, AuCtl_WBR_FD) -+ -+#endif /* __AUFS_TYPE_H__ */ -diff -Nur linux-2.6.36.orig/include/linux/namei.h linux-2.6.36/include/linux/namei.h ---- linux-2.6.36.orig/include/linux/namei.h 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/include/linux/namei.h 2011-01-10 19:52:38.000000000 +0100 -@@ -73,6 +73,9 @@ - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down(struct path *); -diff -Nur linux-2.6.36.orig/include/linux/splice.h linux-2.6.36/include/linux/splice.h ---- linux-2.6.36.orig/include/linux/splice.h 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/include/linux/splice.h 2011-01-10 19:52:38.000000000 +0100 -@@ -89,4 +89,10 @@ - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif - diff --git a/toolchain/kernel-headers/patches/2.6.39.4/etrax-header.patch b/toolchain/kernel-headers/patches/2.6.39.4/etrax-header.patch deleted file mode 100644 index 0c644ce25..000000000 --- a/toolchain/kernel-headers/patches/2.6.39.4/etrax-header.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Nur linux-2.6.36.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.36/arch/cris/include/arch-v10/arch/Kbuild ---- linux-2.6.36.orig/arch/cris/include/arch-v10/arch/Kbuild 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/cris/include/arch-v10/arch/Kbuild 2010-11-15 17:35:24.000000000 +0100 -@@ -1,4 +1,9 @@ -+header-y += dma.h -+header-y += io_interface_mux.h - header-y += user.h - header-y += svinto.h - header-y += sv_addr_ag.h - header-y += sv_addr.agh -+header-y += elf.h -+header-y += page.h -+header-y += ptrace.h -diff -Nur linux-2.6.36.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.36/arch/cris/include/arch-v32/arch/Kbuild ---- linux-2.6.36.orig/arch/cris/include/arch-v32/arch/Kbuild 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/cris/include/arch-v32/arch/Kbuild 2010-11-15 17:35:24.000000000 +0100 -@@ -1,2 +1,6 @@ - header-y += user.h - header-y += cryptocop.h -+header-y += elf.h -+header-y += page.h -+header-y += ptrace.h -+ -diff -Nur linux-2.6.36.orig/arch/cris/include/asm/Kbuild linux-2.6.36/arch/cris/include/asm/Kbuild ---- linux-2.6.36.orig/arch/cris/include/asm/Kbuild 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/cris/include/asm/Kbuild 2010-11-15 17:37:57.000000000 +0100 -@@ -1,10 +1,13 @@ - include include/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -- -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ -+ -+header-y += elf.h - header-y += ethernet.h - header-y += etraxgpio.h - header-y += rs485.h - header-y += rtc.h - header-y += sync_serial.h -+header-y += page.h -+header-y += user.h -diff -Nur linux-2.6.36.orig/include/asm-generic/Kbuild linux-2.6.36/include/asm-generic/Kbuild ---- linux-2.6.36.orig/include/asm-generic/Kbuild 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/include/asm-generic/Kbuild 2010-11-15 17:37:02.000000000 +0100 -@@ -3,14 +3,17 @@ - header-y += errno-base.h - header-y += errno.h - header-y += fcntl.h -+header-y += getorder.h - header-y += int-l64.h - header-y += int-ll64.h - header-y += ioctl.h - header-y += ioctls.h - header-y += ipcbuf.h -+header-y += memory_model.h - header-y += mman-common.h - header-y += mman.h - header-y += msgbuf.h -+header-y += page.h - header-y += param.h - header-y += poll.h - header-y += posix_types.h -diff -Nur linux-2.6.36.orig/include/linux/Kbuild linux-2.6.36/include/linux/Kbuild ---- linux-2.6.36.orig/include/linux/Kbuild 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/include/linux/Kbuild 2010-11-15 17:36:11.000000000 +0100 -@@ -365,6 +365,7 @@ - header-y += un.h - header-y += unistd.h - header-y += usbdevice_fs.h -+header-y += user.h - header-y += utime.h - header-y += utsname.h - header-y += veth.h diff --git a/toolchain/kernel-headers/patches/2.6.39.4/microperl.patch b/toolchain/kernel-headers/patches/2.6.39.4/microperl.patch deleted file mode 100644 index 2955b7421..000000000 --- a/toolchain/kernel-headers/patches/2.6.39.4/microperl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur linux-2.6.30.5.orig/scripts/headers_check.pl linux-2.6.30.5/scripts/headers_check.pl ---- linux-2.6.30.5.orig/scripts/headers_check.pl 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/scripts/headers_check.pl 2009-09-14 21:16:21.000000000 +0200 -@@ -18,7 +18,7 @@ - # - # 3) Check for leaked CONFIG_ symbols - --use strict; -+#use strict; - - my ($dir, $arch, @files) = @ARGV; - -diff -Nur linux-2.6.30.5.orig/scripts/headers_install.pl linux-2.6.30.5/scripts/headers_install.pl ---- linux-2.6.30.5.orig/scripts/headers_install.pl 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/scripts/headers_install.pl 2009-09-14 21:16:11.000000000 +0200 -@@ -16,7 +16,7 @@ - # 2) Drop include of compiler.h - # 3) Drop all sections defined out by __KERNEL__ (using unifdef) - --use strict; -+#use strict; - - my ($readdir, $installdir, $arch, @files) = @ARGV; - diff --git a/toolchain/kernel-headers/patches/3.4.6/aufs2.patch b/toolchain/kernel-headers/patches/3.4.9/aufs2.patch index d40c9a3fe..d40c9a3fe 100644 --- a/toolchain/kernel-headers/patches/3.4.6/aufs2.patch +++ b/toolchain/kernel-headers/patches/3.4.9/aufs2.patch diff --git a/toolchain/kernel-headers/patches/2.6.39.4/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.9/cleankernel.patch index f8d5448ee..f8d5448ee 100644 --- a/toolchain/kernel-headers/patches/2.6.39.4/cleankernel.patch +++ b/toolchain/kernel-headers/patches/3.4.9/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.4.6/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.9/etrax-header.patch index 559c0f322..559c0f322 100644 --- a/toolchain/kernel-headers/patches/3.4.6/etrax-header.patch +++ b/toolchain/kernel-headers/patches/3.4.9/etrax-header.patch diff --git a/toolchain/kernel-headers/patches/2.6.39.4/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch index 7cc381845..7cc381845 100644 --- a/toolchain/kernel-headers/patches/2.6.39.4/linux-gcc-check.patch +++ b/toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch diff --git a/toolchain/kernel-headers/patches/3.4.6/microperl.patch b/toolchain/kernel-headers/patches/3.4.9/microperl.patch index 44c39f6e8..44c39f6e8 100644 --- a/toolchain/kernel-headers/patches/3.4.6/microperl.patch +++ b/toolchain/kernel-headers/patches/3.4.9/microperl.patch diff --git a/toolchain/kernel-headers/patches/3.4.6/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.4.6/mkpiggy.patch +++ b/toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.4.6/relocs.patch b/toolchain/kernel-headers/patches/3.4.9/relocs.patch index 43c5bb580..43c5bb580 100644 --- a/toolchain/kernel-headers/patches/3.4.6/relocs.patch +++ b/toolchain/kernel-headers/patches/3.4.9/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.5/aufs2.patch b/toolchain/kernel-headers/patches/3.5.2/aufs2.patch index d40c9a3fe..d40c9a3fe 100644 --- a/toolchain/kernel-headers/patches/3.5/aufs2.patch +++ b/toolchain/kernel-headers/patches/3.5.2/aufs2.patch diff --git a/toolchain/kernel-headers/patches/3.4.6/cleankernel.patch b/toolchain/kernel-headers/patches/3.5.2/cleankernel.patch index f8d5448ee..f8d5448ee 100644 --- a/toolchain/kernel-headers/patches/3.4.6/cleankernel.patch +++ b/toolchain/kernel-headers/patches/3.5.2/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.5/etrax-header.patch b/toolchain/kernel-headers/patches/3.5.2/etrax-header.patch index 03d19a9ab..03d19a9ab 100644 --- a/toolchain/kernel-headers/patches/3.5/etrax-header.patch +++ b/toolchain/kernel-headers/patches/3.5.2/etrax-header.patch diff --git a/toolchain/kernel-headers/patches/3.4.6/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.5.2/linux-gcc-check.patch index 7cc381845..7cc381845 100644 --- a/toolchain/kernel-headers/patches/3.4.6/linux-gcc-check.patch +++ b/toolchain/kernel-headers/patches/3.5.2/linux-gcc-check.patch diff --git a/toolchain/kernel-headers/patches/3.5/microperl.patch b/toolchain/kernel-headers/patches/3.5.2/microperl.patch index 44c39f6e8..44c39f6e8 100644 --- a/toolchain/kernel-headers/patches/3.5/microperl.patch +++ b/toolchain/kernel-headers/patches/3.5.2/microperl.patch diff --git a/toolchain/kernel-headers/patches/3.5/mkpiggy.patch b/toolchain/kernel-headers/patches/3.5.2/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.5/mkpiggy.patch +++ b/toolchain/kernel-headers/patches/3.5.2/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.5/relocs.patch b/toolchain/kernel-headers/patches/3.5.2/relocs.patch index 43c5bb580..43c5bb580 100644 --- a/toolchain/kernel-headers/patches/3.5/relocs.patch +++ b/toolchain/kernel-headers/patches/3.5.2/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.5.2/sortext.patch b/toolchain/kernel-headers/patches/3.5.2/sortext.patch new file mode 100644 index 000000000..d82b76a2d --- /dev/null +++ b/toolchain/kernel-headers/patches/3.5.2/sortext.patch @@ -0,0 +1,22 @@ +diff -Nur linux-3.5.2.orig/arch/mips/Kconfig linux-3.5.2/arch/mips/Kconfig +--- linux-3.5.2.orig/arch/mips/Kconfig 2012-08-15 16:55:25.000000000 +0200 ++++ linux-3.5.2/arch/mips/Kconfig 2012-08-23 11:10:29.000000000 +0200 +@@ -31,7 +31,6 @@ + select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK + select GENERIC_SMP_IDLE_THREAD +- select BUILDTIME_EXTABLE_SORT + select GENERIC_CLOCKEVENTS + select GENERIC_CMOS_UPDATE + +diff -Nur linux-3.5.2.orig/arch/x86/Kconfig linux-3.5.2/arch/x86/Kconfig +--- linux-3.5.2.orig/arch/x86/Kconfig 2012-08-15 16:55:25.000000000 +0200 ++++ linux-3.5.2/arch/x86/Kconfig 2012-08-23 11:10:17.000000000 +0200 +@@ -85,7 +85,6 @@ + select DCACHE_WORD_ACCESS + select GENERIC_SMP_IDLE_THREAD + select HAVE_ARCH_SECCOMP_FILTER +- select BUILDTIME_EXTABLE_SORT + select GENERIC_CMOS_UPDATE + select CLOCKSOURCE_WATCHDOG + select GENERIC_CLOCKEVENTS diff --git a/toolchain/kernel-headers/patches/3.5/cleankernel.patch b/toolchain/kernel-headers/patches/3.5/cleankernel.patch deleted file mode 100644 index f8d5448ee..000000000 --- a/toolchain/kernel-headers/patches/3.5/cleankernel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-2.6.29.1.orig/scripts/Makefile.headersinst linux-2.6.29.1/scripts/Makefile.headersinst ---- linux-2.6.29.1.orig/scripts/Makefile.headersinst 2009-04-02 22:55:27.000000000 +0200 -+++ linux-2.6.29.1/scripts/Makefile.headersinst 2009-04-17 20:56:09.143476927 +0200 -@@ -65,7 +65,6 @@ - - targets += $(install-file) - $(install-file): scripts/headers_install.pl $(input-files) FORCE -- $(if $(unwanted),$(call cmd,remove),) - $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) - $(call if_changed,install) - diff --git a/toolchain/kernel-headers/patches/3.5/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.5/linux-gcc-check.patch deleted file mode 100644 index 7cc381845..000000000 --- a/toolchain/kernel-headers/patches/3.5/linux-gcc-check.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h linux-2.6.32/arch/mips/include/asm/sgidefs.h ---- linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/arch/mips/include/asm/sgidefs.h 2010-02-14 11:49:21.000000000 +0100 -@@ -11,14 +11,6 @@ - #define __ASM_SGIDEFS_H - - /* -- * Using a Linux compiler for building Linux seems logic but not to -- * everybody. -- */ --#ifndef __linux__ --#error Use a Linux compiler or give up. --#endif -- --/* - * Definitions for the ISA levels - * - * With the introduction of MIPS32 / MIPS64 instruction sets definitions |