summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-12-18 22:39:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-20 15:22:16 +0000
commit0cc22efe40567ac629c79044fe8b2439a7771ae9 (patch)
treed4d7f754054325dfba7632a251371be46b226ed6 /meta/recipes-extended
parenta6a49f763f164feea39c37d53d5afc1244ca9aa6 (diff)
downloadpoky-0cc22efe40567ac629c79044fe8b2439a7771ae9.tar.gz
mdadm: Fix build with glibc 2.25
(From OE-Core rev: 32643ed355c94035d6fabbd0cd9e4c6f3b18ab56) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch48
-rw-r--r--meta/recipes-extended/mdadm/mdadm_3.4.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch b/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
new file mode 100644
index 0000000000..acd64ada22
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
@@ -0,0 +1,48 @@
1From 943616e5dffb79f307e4bd9b249d316212998750 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 18 Dec 2016 08:30:51 +0000
4Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions
5
6glibc 2.25 is warning about it if applications depend on
7sys/types.h for these macros, it expects to be included
8from <sys/sysmacros.h>
9
10Fixes
11| Grow.c:3534:13: error: In the GNU C Library, "minor" is defined
12| by <sys/sysmacros.h>. For historical compatibility, it is
13| currently defined by <sys/types.h> as well, but we plan to
14| remove this soon. To use "minor", include <sys/sysmacros.h>
15| directly. If you did not intend to use a system-defined macro
16| "minor", you should undefine it after including <sys/types.h>. [-Werror]
17| Query.c: In function 'Query':
18| Query.c:105:13: error: In the GNU C Library, "makedev" is defined
19| by <sys/sysmacros.h>. For historical compatibility, it is
20| currently defined by <sys/types.h> as well, but we plan to
21| remove this soon. To use "makedev", include <sys/sysmacros.h>
22| directly. If you did not intend to use a system-defined macro
23| "makedev", you should undefine it after including <sys/types.h>. [-Werror]
24| makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
25| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
26
27Signed-off-by: Khem Raj <raj.khem@gmail.com>
28---
29Upstream-Status: Pending
30
31 mdadm.h | 1 +
32 1 file changed, 1 insertion(+)
33
34diff --git a/mdadm.h b/mdadm.h
35index 8c8f4d1..3ce13b5 100755
36--- a/mdadm.h
37+++ b/mdadm.h
38@@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
39 #endif
40
41 #include <sys/types.h>
42+#include <sys/sysmacros.h>
43 #include <sys/stat.h>
44 #include <stdint.h>
45 #include <stdlib.h>
46--
471.9.1
48
diff --git a/meta/recipes-extended/mdadm/mdadm_3.4.bb b/meta/recipes-extended/mdadm/mdadm_3.4.bb
index d34b885076..7bf15b51be 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.4.bb
@@ -21,6 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
21 file://run-ptest \ 21 file://run-ptest \
22 file://0001-raid6check-Fix-if-else-indentation.patch \ 22 file://0001-raid6check-Fix-if-else-indentation.patch \
23 file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ 23 file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \
24 file://0001-include-sys-sysmacros.h-for-major-minor-defintions.patch \
24 " 25 "
25SRC_URI[md5sum] = "04b8b21f637540350f8517c7e68d3c63" 26SRC_URI[md5sum] = "04b8b21f637540350f8517c7e68d3c63"
26SRC_URI[sha256sum] = "27d0be4627d38a12ddcd1c1c3721d649d4e89e1093914497e22b57245cda8808" 27SRC_URI[sha256sum] = "27d0be4627d38a12ddcd1c1c3721d649d4e89e1093914497e22b57245cda8808"