summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-02-10 18:35:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:50 +0000
commitf0d5478de47cb7dd45141a279f067be869a2f4c5 (patch)
treeb342fcc0c9ddef95918745e9eceed377d0738422 /meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
parent79d5041a9c9ff16ca254d99f87c9ad0f178d48e6 (diff)
downloadpoky-f0d5478de47cb7dd45141a279f067be869a2f4c5.tar.gz
mdadm: update to version 3.4
3.3.4 -> 3.4 a) Removed the following upstreamed patch: 1. 0001-Define-_POSIX_C_SOURCE-if-undefined.patch b) Added following patches to fix uclibc,musl and x32 build failures 1. 0001-mdadm.h-bswap-is-already-defined-in-uclibc.patch 2. 0001-util.c-include-poll.h-instead-of-sys-poll.h.patch 3. 0001-Fix-some-type-comparison-problems.patch 4. 0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch (From OE-Core rev: e1ae012388e4321b95cd79c014af135cf6c419ad) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch b/meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
new file mode 100644
index 0000000000..d5cf003745
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
@@ -0,0 +1,45 @@
1From 2645673a7ea948a1297d5b8f0daab29b898f044f Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Fri, 5 Feb 2016 17:14:04 +0200
4Subject: [PATCH] util.c: include poll.h instead of sys/poll.h
5
6This fixes a compile warning when building with musl:
7
8 In file included from util.c:27:0:
9 |
10 qemux86-64/usr/include/sys/poll.h:1:2:
11 error: #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
12 [-Werror=cpp]
13 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
14 | ^
15
16Upstream-Status: Accepted
17
18Signed-off-by: Maxin B. John <maxin.john@intel.com>
19---
20 util.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/util.c b/util.c
24index 970d484..3e6d293 100644
25--- a/util.c
26+++ b/util.c
27@@ -24,7 +24,6 @@
28
29 #include "mdadm.h"
30 #include "md_p.h"
31-#include <sys/poll.h>
32 #include <sys/socket.h>
33 #include <sys/utsname.h>
34 #include <sys/wait.h>
35@@ -32,6 +31,7 @@
36 #include <sys/resource.h>
37 #include <sys/vfs.h>
38 #include <linux/magic.h>
39+#include <poll.h>
40 #include <ctype.h>
41 #include <dirent.h>
42 #include <signal.h>
43--
442.4.0
45