From 5b24264da4771bd7af8a218619a5563b6a9d4217 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 11 Dec 2012 07:58:32 +0000 Subject: kernel-headers: bump versions, remove deprecated, new deprecated 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 Signed-off-by: Peter Korsgaard --- toolchain/kernel-headers/Config.in | 32 ++++++--------- ...tall-fix-__packed-in-exported-kernel-head.patch | 46 ---------------------- ...tall-fix-__packed-in-exported-kernel-head.patch | 46 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 66 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch create mode 100644 toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch (limited to 'toolchain') diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 0f3ed4f1d..daffef7a9 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -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 index 8777b7163..000000000 --- a/toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f210735fe2f17a6225432ee3d1239bcf23a8659c Mon Sep 17 00:00:00 2001 -From: Markus Trippelsdorf -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 -CC: Joe Perches -Signed-off-by: Markus Trippelsdorf -Signed-off-by: Michal Marek ---- - 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 //; - $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 index 000000000..8777b7163 --- /dev/null +++ b/toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch @@ -0,0 +1,46 @@ +From f210735fe2f17a6225432ee3d1239bcf23a8659c Mon Sep 17 00:00:00 2001 +From: Markus Trippelsdorf +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 +CC: Joe Perches +Signed-off-by: Markus Trippelsdorf +Signed-off-by: Michal Marek +--- + 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 //; + $line =~ s/(^|\s)(inline)\b/$1__$2__/g; + $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; +-- +1.7.5.4 + -- cgit v1.2.3