kernel-headers: bump versions, remove deprecated, new deprecated
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Tue, 11 Dec 2012 07:58:32 +0000 (07:58 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 11 Dec 2012 20:25:27 +0000 (21:25 +0100)
Bump 3.{0, 4, 6}.x stable versions
Add new version 3.7
Remove deprecated 2.6.{37, 38, 39} versions.
Mark 3.{1, 3, 5} as deprecated to follow upstream EOLs.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
toolchain/kernel-headers/Config.in
toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch [deleted file]
toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch [new file with mode: 0644]

index 0f3ed4f1d13f5d566e9224ac6e70f4560271bfb3..daffef7a9c58a7eb33e78616594a5807a0a6a887 100644 (file)
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
        prompt "Kernel Headers"
-       default BR2_KERNEL_HEADERS_3_6
+       default BR2_KERNEL_HEADERS_3_7
        help
          Select the version of kernel header files you wish to use.
          You must select the correct set of header files to match
@@ -15,39 +15,33 @@ choice
          For the snapshot, you have to provide the
          linux-2.6.tar.bz2 tarball in your download dir.
 
-       config BR2_KERNEL_HEADERS_2_6_37
-               bool "Linux 2.6.37.x kernel headers"
-               depends on BR2_DEPRECATED
-
-       config BR2_KERNEL_HEADERS_2_6_38
-               bool "Linux 2.6.38.x kernel headers"
-               depends on BR2_DEPRECATED
-
-       config BR2_KERNEL_HEADERS_2_6_39
-               bool "Linux 2.6.39.x kernel headers"
-               depends on BR2_DEPRECATED
-
        config BR2_KERNEL_HEADERS_3_0
                bool "Linux 3.0.x kernel headers"
 
        config BR2_KERNEL_HEADERS_3_1
                bool "Linux 3.1.x kernel headers"
+               depends on BR2_DEPRECATED
 
        config BR2_KERNEL_HEADERS_3_2
                bool "Linux 3.2.x kernel headers"
 
        config BR2_KERNEL_HEADERS_3_3
                bool "Linux 3.3.x kernel headers"
+               depends on BR2_DEPRECATED
 
        config BR2_KERNEL_HEADERS_3_4
                bool "Linux 3.4.x kernel headers"
 
        config BR2_KERNEL_HEADERS_3_5
                bool "Linux 3.5.x kernel headers"
+               depends on BR2_DEPRECATED
 
        config BR2_KERNEL_HEADERS_3_6
                bool "Linux 3.6.x kernel headers"
 
+       config BR2_KERNEL_HEADERS_3_7
+               bool "Linux 3.7.x kernel headers"
+
        config BR2_KERNEL_HEADERS_VERSION
                bool "Linux 2.6 (manually specified version)"
 
@@ -60,19 +54,17 @@ config BR2_DEFAULT_KERNEL_VERSION
        depends on BR2_KERNEL_HEADERS_VERSION
        help
          Specify the version you want to use.
-         E.G.: 2.6.38
+         E.G.: 3.6.10
 
 config BR2_DEFAULT_KERNEL_HEADERS
        string
-       default "2.6.37.6"      if BR2_KERNEL_HEADERS_2_6_37
-       default "2.6.38.8"      if BR2_KERNEL_HEADERS_2_6_38
-       default "2.6.39.4"      if BR2_KERNEL_HEADERS_2_6_39
-       default "3.0.55"        if BR2_KERNEL_HEADERS_3_0
+       default "3.0.56"        if BR2_KERNEL_HEADERS_3_0
        default "3.1.10"        if BR2_KERNEL_HEADERS_3_1
        default "3.2.35"        if BR2_KERNEL_HEADERS_3_2
        default "3.3.8"         if BR2_KERNEL_HEADERS_3_3
-       default "3.4.22"        if BR2_KERNEL_HEADERS_3_4
+       default "3.4.23"        if BR2_KERNEL_HEADERS_3_4
        default "3.5.7"         if BR2_KERNEL_HEADERS_3_5
-       default "3.6.9"         if BR2_KERNEL_HEADERS_3_6
+       default "3.6.10"        if BR2_KERNEL_HEADERS_3_6
+       default "3.7"           if BR2_KERNEL_HEADERS_3_7
        default "2.6"           if BR2_KERNEL_HEADERS_SNAP
        default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch
deleted file mode 100644 (file)
index 8777b71..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From f210735fe2f17a6225432ee3d1239bcf23a8659c Mon Sep 17 00:00:00 2001
-From: Markus Trippelsdorf <markus@trippelsdorf.de>
-Date: Fri, 24 Jun 2011 15:51:00 +0200
-Subject: [PATCH] headers_install: fix __packed in exported kernel headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-checkpatch.pl warns about using __attribute__((packed)) in kernel
-headers: "__packed is preferred over __attribute__((packed))". If one
-follows that advice it could cause problems in the exported header
-files, because the outside world doesn't know about this shortcut.
-
-For example busybox will fail to compile:
- CC      miscutils/ubi_attach_detach.o
- In file included from miscutils/ubi_attach_detach.c:27:0:
- /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
- /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
-...
-
-Fix the problem by substituting __packed with __attribute__((packed)) in
-the header_install.pl script.
-
-Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-CC: Joe Perches <joe@perches.com>
-Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
-Signed-off-by: Michal Marek <mmarek@suse.cz>
----
- scripts/headers_install.pl |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
-index efb3be1..48462be 100644
---- a/scripts/headers_install.pl
-+++ b/scripts/headers_install.pl
-@@ -35,6 +35,7 @@ foreach my $file (@files) {
-               $line =~ s/([\s(])__iomem\s/$1/g;
-               $line =~ s/\s__attribute_const__\s/ /g;
-               $line =~ s/\s__attribute_const__$//g;
-+              $line =~ s/\b__packed\b/__attribute__((packed))/g;
-               $line =~ s/^#include <linux\/compiler.h>//;
-               $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
-               $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
--- 
-1.7.5.4
-
diff --git a/toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch
new file mode 100644 (file)
index 0000000..8777b71
--- /dev/null
@@ -0,0 +1,46 @@
+From f210735fe2f17a6225432ee3d1239bcf23a8659c Mon Sep 17 00:00:00 2001
+From: Markus Trippelsdorf <markus@trippelsdorf.de>
+Date: Fri, 24 Jun 2011 15:51:00 +0200
+Subject: [PATCH] headers_install: fix __packed in exported kernel headers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+checkpatch.pl warns about using __attribute__((packed)) in kernel
+headers: "__packed is preferred over __attribute__((packed))". If one
+follows that advice it could cause problems in the exported header
+files, because the outside world doesn't know about this shortcut.
+
+For example busybox will fail to compile:
+ CC      miscutils/ubi_attach_detach.o
+ In file included from miscutils/ubi_attach_detach.c:27:0:
+ /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
+ /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
+...
+
+Fix the problem by substituting __packed with __attribute__((packed)) in
+the header_install.pl script.
+
+Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
+CC: Joe Perches <joe@perches.com>
+Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
+Signed-off-by: Michal Marek <mmarek@suse.cz>
+---
+ scripts/headers_install.pl |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
+index efb3be1..48462be 100644
+--- a/scripts/headers_install.pl
++++ b/scripts/headers_install.pl
+@@ -35,6 +35,7 @@ foreach my $file (@files) {
+               $line =~ s/([\s(])__iomem\s/$1/g;
+               $line =~ s/\s__attribute_const__\s/ /g;
+               $line =~ s/\s__attribute_const__$//g;
++              $line =~ s/\b__packed\b/__attribute__((packed))/g;
+               $line =~ s/^#include <linux\/compiler.h>//;
+               $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
+               $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
+-- 
+1.7.5.4
+