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>2017-01-13 14:57:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:47:21 +0000
commit17a92e1fb0494d8026219b372af9a28006f9bc53 (patch)
tree2c700748ebb064c5962a8365628b7070bc602af4 /meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
parent2068a1e37a7a048ee7b01a7da016009b5e69f620 (diff)
downloadpoky-17a92e1fb0494d8026219b372af9a28006f9bc53.tar.gz
mdadm: upgrade to version 4.0
3.4 -> 4.0 Removed the following upstreamed or backported patches: a) 0001-Fix-some-type-comparison-problems.patch b) 0001-Fix-typo-in-comparision.patch c) 0001-mdadm.h-bswap-is-already-defined-in-uclibc.patch d) 0001-raid6check-Fix-if-else-indentation.patch e) 0001-util.c-include-poll.h-instead-of-sys-poll.h.patch f) mdadm-3.2.2_fix_for_x32.patch (From OE-Core rev: b32f5098fc06c96d9331abe0f4ff9cc7c7c08c76) 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, 0 insertions, 45 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
deleted file mode 100644
index d5cf003745..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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