diff options
-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)\" |