diff options
Diffstat (limited to 'meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch')
-rw-r--r-- | meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch | 21 |
1 files changed, 4 insertions, 17 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 a89161404d..298f276cd6 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1f5baf3ad95ae4c39efe4d8ad8b2e642b3a351da Mon Sep 17 00:00:00 2001 | 1 | From a9166bf422da1001bac9cc819386bf39b7cd1b73 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 9 Feb 2016 11:44:01 +0200 | 3 | Date: Tue, 9 Feb 2016 11:44:01 +0200 |
4 | Subject: [PATCH] Fix the path of corosync and dlm header files check | 4 | Subject: [PATCH] Fix the path of corosync and dlm header files check |
@@ -9,28 +9,18 @@ Fix it. | |||
9 | Upstream-Status: Inappropriate [Yocto specific] | 9 | 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 | --- | ||
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 | 12 | ||
20 | Build with corosync only header file corosync/cmap.h exists. | ||
21 | |||
22 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
23 | --- | 13 | --- |
24 | Makefile | 4 ++-- | 14 | Makefile | 4 ++-- |
25 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
26 | 16 | ||
27 | diff --git a/Makefile b/Makefile | 17 | diff --git a/Makefile b/Makefile |
28 | index fd79cfb..34150a9 100644 | 18 | index 2767ac6..46bf57b 100644 |
29 | --- a/Makefile | 19 | --- a/Makefile |
30 | +++ b/Makefile | 20 | +++ b/Makefile |
31 | @@ -80,8 +80,8 @@ MDMON_DIR = $(RUN_DIR) | 21 | @@ -91,8 +91,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots |
32 | FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots | ||
33 | SYSTEMD_DIR=/lib/systemd/system | 22 | SYSTEMD_DIR=/lib/systemd/system |
23 | LIB_DIR=/usr/libexec/mdadm | ||
34 | 24 | ||
35 | -COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) | 25 | -COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) |
36 | -DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) | 26 | -DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) |
@@ -39,6 +29,3 @@ index fd79cfb..34150a9 100644 | |||
39 | 29 | ||
40 | DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" | 30 | DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" |
41 | DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" | 31 | DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" |
42 | -- | ||
43 | 2.4.0 | ||
44 | |||