sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

mdadm: update criteria to build with corosync 

mdadm only works with corosync 2.x which provides header file corosync/cmap.h.
If build mdadm with corosync 1.x, it fails with:

| member.c:12:27: fatal error: corosync/cmap.h: No such file or directory
|  #include <corosync/cmap.h>
|                            ^

Build with corosync only header file corosync/cmap.h exists.

Ref:
https://github.com/neilbrown/mdadm/blob/master/mdadm.h#L63

(From OE-Core rev: b2a785f19fe25d244179b8672c846925da6d455a)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang 2017-03-24 17:18:57 +08:00 committed by Richard Purdie
parent 4ca286d45c
commit 794f9c9777
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
View File

@ -9,6 +9,17 @@ Fix it.
Upstream-Status: Inappropriate [Yocto specific]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
mdadm only works with corosync 2.x which provides header file corosync/cmap.h.
If build mdadm with corosync 1.x, it fails with:
| member.c:12:27: fatal error: corosync/cmap.h: No such file or directory
| #include <corosync/cmap.h>
| ^
Build with corosync only header file corosync/cmap.h exists.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@ -23,7 +34,7 @@ index fd79cfb..34150a9 100644
-COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC)
-DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM)
+COROSYNC:=$(shell [ -d $(SYSROOT)/usr/include/corosync ] || echo -DNO_COROSYNC)
+COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo -DNO_COROSYNC)
+DLM:=$(shell [ -f $(SYSROOT)/usr/include/libdlm.h ] || echo -DNO_DLM)
DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"