diff options
| author | Maxin B. John <maxin.john@intel.com> | 2016-02-10 18:35:12 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-11 12:27:29 +0000 |
| commit | e1ae012388e4321b95cd79c014af135cf6c419ad (patch) | |
| tree | 89432a393c750f65c723bc3eaa1f69b321052616 /meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch | |
| parent | 4e94ba3b0b8b476e46441707d3b1ead13da4ea76 (diff) | |
| download | openembedded-core-e1ae012388e4321b95cd79c014af135cf6c419ad.tar.gz openembedded-core-e1ae012388e4321b95cd79c014af135cf6c419ad.tar.bz2 openembedded-core-e1ae012388e4321b95cd79c014af135cf6c419ad.zip | |
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
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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.patch | 45 |
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 @@ +From 2645673a7ea948a1297d5b8f0daab29b898f044f Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Fri, 5 Feb 2016 17:14:04 +0200 +Subject: [PATCH] util.c: include poll.h instead of sys/poll.h + +This fixes a compile warning when building with musl: + + In file included from util.c:27:0: + | + qemux86-64/usr/include/sys/poll.h:1:2: + error: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> + [-Werror=cpp] + | #warning redirecting incorrect #include <sys/poll.h> to <poll.h> + | ^ + +Upstream-Status: Accepted + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index 970d484..3e6d293 100644 +--- a/util.c ++++ b/util.c +@@ -24,7 +24,6 @@ + + #include "mdadm.h" + #include "md_p.h" +-#include <sys/poll.h> + #include <sys/socket.h> + #include <sys/utsname.h> + #include <sys/wait.h> +@@ -32,6 +31,7 @@ + #include <sys/resource.h> + #include <sys/vfs.h> + #include <linux/magic.h> ++#include <poll.h> + #include <ctype.h> + #include <dirent.h> + #include <signal.h> +-- +2.4.0 + |