Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From a9166bf422da1001bac9cc819386bf39b7cd1b73 Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
| 3 | Date: Tue, 9 Feb 2016 11:44:01 +0200 |
| 4 | Subject: [PATCH] Fix the path of corosync and dlm header files check |
| 5 | |
| 6 | Original Makefile will check headers on host instead of sysroot. |
| 7 | Fix it. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [Yocto specific] |
| 10 | |
| 11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 13 | --- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 14 | Makefile | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/Makefile b/Makefile |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 18 | index 2767ac6..46bf57b 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | --- a/Makefile |
| 20 | +++ b/Makefile |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 21 | @@ -91,8 +91,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | SYSTEMD_DIR=/lib/systemd/system |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 23 | LIB_DIR=/usr/libexec/mdadm |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 24 | |
| 25 | -COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) |
| 26 | -DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 27 | +COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo -DNO_COROSYNC) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 28 | +DLM:=$(shell [ -f $(SYSROOT)/usr/include/libdlm.h ] || echo -DNO_DLM) |
| 29 | |
| 30 | DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" |
| 31 | DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" |