From 2e7ffd6c849f0aab66fc886a84576aaa31b5a9bc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 29 Apr 2012 02:34:00 +0000 Subject: kernel-headers: bump 3.{0, 3}.x stable versions Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- toolchain/kernel-headers/Config.in | 4 +- ...tall-fix-__packed-in-exported-kernel-head.patch | 46 ---------------------- ...tall-fix-__packed-in-exported-kernel-head.patch | 46 ++++++++++++++++++++++ .../kernel-headers/linux-3.3.3-fix-umode_t.patch | 22 ----------- .../kernel-headers/linux-3.3.4-fix-umode_t.patch | 22 +++++++++++ 5 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch create mode 100644 toolchain/kernel-headers/linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch delete mode 100644 toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch create mode 100644 toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 05227cfe2..aeeebeff5 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS 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.29" if BR2_KERNEL_HEADERS_3_0 + default "3.0.30" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 default "3.2.16" if BR2_KERNEL_HEADERS_3_2 - default "3.3.3" if BR2_KERNEL_HEADERS_3_3 + default "3.3.4" if BR2_KERNEL_HEADERS_3_3 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.29-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch deleted file mode 100644 index 8777b7163..000000000 --- a/toolchain/kernel-headers/linux-3.0.29-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.30-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.30-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.30-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 + diff --git a/toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch deleted file mode 100644 index 966366225..000000000 --- a/toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix a problem with the 3.3 kernel headers. Specifically, the umode_t type -is defined within a __KERNEL__ preprocessor ifdef region, and so the type -is not usable by non-kernel code. Visit the following URL for more details. - -* http://www.spinics.net/lists/linux-fsdevel/msg52638.html - -The commit that created the problem can be seen at the following URL. - -* http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commitdiff;h=0583fcc96bb117763c0fa74c123573c0112dec65 - -diff -Nur a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h ---- a/include/linux/ext2_fs.h 2012-03-18 23:15:34.000000000 +0000 -+++ b/include/linux/ext2_fs.h 2012-03-21 11:47:53.015548437 +0000 -@@ -209,7 +209,7 @@ - #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL) - - /* Mask out flags that are inappropriate for the given type of inode. */ --static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags) -+static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags) - { - if (S_ISDIR(mode)) - return flags; diff --git a/toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch new file mode 100644 index 000000000..966366225 --- /dev/null +++ b/toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch @@ -0,0 +1,22 @@ +Fix a problem with the 3.3 kernel headers. Specifically, the umode_t type +is defined within a __KERNEL__ preprocessor ifdef region, and so the type +is not usable by non-kernel code. Visit the following URL for more details. + +* http://www.spinics.net/lists/linux-fsdevel/msg52638.html + +The commit that created the problem can be seen at the following URL. + +* http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commitdiff;h=0583fcc96bb117763c0fa74c123573c0112dec65 + +diff -Nur a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h +--- a/include/linux/ext2_fs.h 2012-03-18 23:15:34.000000000 +0000 ++++ b/include/linux/ext2_fs.h 2012-03-21 11:47:53.015548437 +0000 +@@ -209,7 +209,7 @@ + #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL) + + /* Mask out flags that are inappropriate for the given type of inode. */ +-static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags) ++static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags) + { + if (S_ISDIR(mode)) + return flags; -- cgit v1.2.3