diff options
| author | Kai Kang <kai.kang@windriver.com> | 2017-03-24 17:18:57 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-26 13:17:04 +0100 |
| commit | b2a785f19fe25d244179b8672c846925da6d455a (patch) | |
| tree | fbd0d47bb4f00d1782c6b417263506ec8bed887c /meta/recipes-extended | |
| parent | 131629ca6238ea0596f5dd11d659ce2ca63067a4 (diff) | |
| download | openembedded-core-b2a785f19fe25d244179b8672c846925da6d455a.tar.gz openembedded-core-b2a785f19fe25d244179b8672c846925da6d455a.tar.bz2 openembedded-core-b2a785f19fe25d244179b8672c846925da6d455a.zip | |
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
Signed-off-by: Kai Kang <kai.kang@windriver.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-Fix-the-path-of-corosync-and-dlm-header-files-check.patch | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch index deb7486383..a89161404d 100644 --- a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch +++ b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch @@ -10,6 +10,17 @@ 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)\" |