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-27 08:15:07 +0100 |
| commit | 794f9c9777309c5e9637e8f0f59a4c08e164861a (patch) | |
| tree | a073416a05f3581e2345724a32dc7d57be1f0127 | |
| parent | 4ca286d45cb9fd9234ac9e10341f326329f705bf (diff) | |
| download | poky-794f9c9777309c5e9637e8f0f59a4c08e164861a.tar.gz | |
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>
| -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] | |||
| 10 | 10 | ||
| 11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| 12 | --- | 12 | --- |
| 13 | mdadm only works with corosync 2.x which provides header file corosync/cmap.h. | ||
| 14 | If build mdadm with corosync 1.x, it fails with: | ||
| 15 | |||
| 16 | | member.c:12:27: fatal error: corosync/cmap.h: No such file or directory | ||
| 17 | | #include <corosync/cmap.h> | ||
| 18 | | ^ | ||
| 19 | |||
| 20 | Build with corosync only header file corosync/cmap.h exists. | ||
| 21 | |||
| 22 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 23 | --- | ||
| 13 | Makefile | 4 ++-- | 24 | Makefile | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 25 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | 26 | ||
| @@ -23,7 +34,7 @@ index fd79cfb..34150a9 100644 | |||
| 23 | 34 | ||
| 24 | -COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) | 35 | -COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) |
| 25 | -DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) | 36 | -DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) |
| 26 | +COROSYNC:=$(shell [ -d $(SYSROOT)/usr/include/corosync ] || echo -DNO_COROSYNC) | 37 | +COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo -DNO_COROSYNC) |
| 27 | +DLM:=$(shell [ -f $(SYSROOT)/usr/include/libdlm.h ] || echo -DNO_DLM) | 38 | +DLM:=$(shell [ -f $(SYSROOT)/usr/include/libdlm.h ] || echo -DNO_DLM) |
| 28 | 39 | ||
| 29 | DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" | 40 | DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" |