summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-12-10 10:16:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-14 09:11:15 +0000
commit66a5f8d02ae619b5258c232e3904d8fa02fd669b (patch)
tree26dba53ea129cb517a25c5aaa84fad52645c060a /meta/recipes-kernel
parent4bb18c41e8537531bd8f8749f320fa6ddc35e398 (diff)
downloadpoky-66a5f8d02ae619b5258c232e3904d8fa02fd669b.tar.gz
linux-libc-headers: fix MIPS klibc build error
As reported by Andrea Adami, klibc fails to build for MIPS with the 3.10 libc-headers commit ca044f9a [UAPI: fix endianness conditionals in linux/raid/md_p.h] is the root cause of the breakage. This is fixed in the kernel source itself, but we must also carry the change in the linux-libc-headers recipe, until we update past the 3.13 kernel. With this change, we can again build klibc for mips, with no impact on the rest of the system. cc: Andrea Adami <andrea.adami@gmail.com> (From OE-Core rev: f2f8a2a05cbfff7e1d5d979ec1b9f4f371579fb9) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch34
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb3
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch
new file mode 100644
index 0000000000..1bf0e7ec85
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch
@@ -0,0 +1,34 @@
1From c0f8bd146a8b3e630798561c605f5669823107af Mon Sep 17 00:00:00 2001
2From: Aurelien Jarno <aurelien@aurel32.net>
3Date: Thu, 14 Nov 2013 15:16:19 +1100
4Subject: [PATCH] UAPI: include <asm/byteorder.h> in linux/raid/md_p.h
5
6linux/raid/md_p.h is using conditionals depending on endianess and fails
7with an error if neither of __BIG_ENDIAN, __LITTLE_ENDIAN or
8__BYTE_ORDER are defined, but it doesn't include any header which can
9define these constants. This make this header unusable alone.
10
11This patch adds a #include <asm/byteorder.h> at the beginning of this
12header to make it usable alone. This is needed to compile klibc on MIPS.
13
14Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
15Signed-off-by: NeilBrown <neilb@suse.de>
16---
17 include/uapi/linux/raid/md_p.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h
21index fe1a540..f7cf7f3 100644
22--- a/include/uapi/linux/raid/md_p.h
23+++ b/include/uapi/linux/raid/md_p.h
24@@ -16,6 +16,7 @@
25 #define _MD_P_H
26
27 #include <linux/types.h>
28+#include <asm/byteorder.h>
29
30 /*
31 * RAID superblock.
32--
331.8.1.2
34
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
index 65df230c4b..a78d4ba59a 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
@@ -3,6 +3,9 @@ require linux-libc-headers.inc
3SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch" 3SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch"
4SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch" 4SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch"
5 5
6# fixes klibc build for MIPS, drop when libc-headers > 3.13
7SRC_URI += "file://UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch"
8
6SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" 9SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944"
7SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" 10SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8"
8 11