Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 517393d903089f921915530ffa689a7a1d113420 / . / meta-openembedded / meta-oe / recipes-support / multipath-tools / files / 0030-Always-use-devmapper.patch
blob: c2025ed6fff6ed00705bb9182daae8a4b1762c6d [file] [log] [blame]
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]1From f20d7651a62efff818ebd0d1bc920f6f362c890d Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]2From: Changqing Li <changqing.li@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]3Date: Mon, 26 Nov 2018 11:17:41 +0800
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]4Subject: [PATCH] Subject: [PATCH] Always use devmapper
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]5
6Do not try to compute several _API_ make variables
7from host information when cross-compiling.
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
12Signed-off-by: Joe Slater <joe.slater@windriver.com>
13
14Rebase to 0.7.1
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17
18Rebase to 0.7.7
19
20Signed-off-by: Changqing Li <changqing.li@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]21
22Rebase to 0.7.9
23Signed-off-by: Changqing Li <changqing.li@windriver.com>
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]24[OP: Rebase to 0.9.3]
25Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]26---
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]27 libmultipath/Makefile | 34 +++++++---------------------------
28 1 file changed, 7 insertions(+), 27 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]29
30diff --git a/libmultipath/Makefile b/libmultipath/Makefile
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]31index 3b60a525..72aca7ca 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]32--- a/libmultipath/Makefile
33+++ b/libmultipath/Makefile
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]34@@ -22,33 +22,13 @@ ifdef SYSTEMD
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]35 endif
36 endif
37
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]38-ifneq ($(call check_func,dm_task_no_flush,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
39- CPPFLAGS += -DLIBDM_API_FLUSH
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]40-endif
41-
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]42-ifneq ($(call check_func,dm_task_get_errno,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
43- CPPFLAGS += -DLIBDM_API_GET_ERRNO
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]44-endif
45-
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]46-ifneq ($(call check_func,dm_task_set_cookie,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
47- CPPFLAGS += -DLIBDM_API_COOKIE
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]48-endif
49-
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]50-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(LIBUDEV_INCDIR)/libudev.h),0)
51- CPPFLAGS += -DLIBUDEV_API_RECVBUF
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]52-endif
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]53-
54-ifneq ($(call check_func,dm_task_deferred_remove,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
55- CPPFLAGS += -DLIBDM_API_DEFERRED
56-endif
57-
58-ifneq ($(call check_func,dm_hold_control_dev,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
59- CPPFLAGS += -DLIBDM_API_HOLD_CONTROL
60-endif
61-
62-ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(LINUX_HEADERS_INCDIR)/scsi/fc/fc_els.h),0)
63- CPPFLAGS += -DFPIN_EVENT_HANDLER
64-endif
65+CPPFLAGS += -DLIBDM_API_FLUSH
66+CPPFLAGS += -DLIBDM_API_GET_ERRNO
67+CPPFLAGS += -DLIBDM_API_COOKIE
68+CPPFLAGS += -DLIBUDEV_API_RECVBUF
69+CPPFLAGS += -DLIBDM_API_DEFERRED
70+CPPFLAGS += -DLIBDM_API_HOLD_CONTROL
71+CPPFLAGS += -DFPIN_EVENT_HANDLER
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]72
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]73 # object files referencing MULTIPATH_DIR or CONFIG_DIR
74 # they need to be recompiled for unit tests
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]75--
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]762.38.1
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]77