| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame^] | 1 | From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Mon, 26 Nov 2018 11:17:41 +0800 |
| 4 | Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper |
| 5 | |
| 6 | Do not try to compute several _API_ make variables |
| 7 | from host information when cross-compiling. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [embedded specific] |
| 10 | |
| 11 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> |
| 12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 13 | |
| 14 | [OP: Rebase to 0.9.3] |
| 15 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
| 16 | |
| 17 | Rebase to 0.9.8 |
| 18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 19 | --- |
| 20 | create-config.mk | 36 ++++++++---------------------------- |
| 21 | 1 file changed, 8 insertions(+), 28 deletions(-) |
| 22 | |
| 23 | diff --git a/create-config.mk b/create-config.mk |
| 24 | index a65975ba..8ba592f4 100644 |
| 25 | --- a/create-config.mk |
| 26 | +++ b/create-config.mk |
| 27 | @@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ |
| 28 | |
| 29 | DEFINES := |
| 30 | |
| 31 | -ifneq ($(call check_func,dm_task_no_flush,$(devmapper_incdir)/libdevmapper.h),0) |
| 32 | - DEFINES += LIBDM_API_FLUSH |
| 33 | -endif |
| 34 | - |
| 35 | -ifneq ($(call check_func,dm_task_get_errno,$(devmapper_incdir)/libdevmapper.h),0) |
| 36 | - DEFINES += LIBDM_API_GET_ERRNO |
| 37 | -endif |
| 38 | - |
| 39 | -ifneq ($(call check_func,dm_task_set_cookie,$(devmapper_incdir)/libdevmapper.h),0) |
| 40 | - DEFINES += LIBDM_API_COOKIE |
| 41 | -endif |
| 42 | - |
| 43 | -ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(libudev_incdir)/libudev.h),0) |
| 44 | - DEFINES += LIBUDEV_API_RECVBUF |
| 45 | -endif |
| 46 | - |
| 47 | -ifneq ($(call check_func,dm_task_deferred_remove,$(devmapper_incdir)/libdevmapper.h),0) |
| 48 | - DEFINES += LIBDM_API_DEFERRED |
| 49 | -endif |
| 50 | - |
| 51 | -ifneq ($(call check_func,dm_hold_control_dev,$(devmapper_incdir)/libdevmapper.h),0) |
| 52 | - DEFINES += LIBDM_API_HOLD_CONTROL |
| 53 | -endif |
| 54 | - |
| 55 | -ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(kernel_incdir)/scsi/fc/fc_els.h),0) |
| 56 | - DEFINES += FPIN_EVENT_HANDLER |
| 57 | - FPIN_SUPPORT = 1 |
| 58 | -endif |
| 59 | +DEFINES += LIBDM_API_FLUSH |
| 60 | +DEFINES += LIBDM_API_GET_ERRNO |
| 61 | +DEFINES += LIBDM_API_COOKIE |
| 62 | +DEFINES += LIBUDEV_API_RECVBUF |
| 63 | +DEFINES += LIBDM_API_DEFERRED |
| 64 | +DEFINES += LIBDM_API_HOLD_CONTROL |
| 65 | +DEFINES += FPIN_EVENT_HANDLER |
| 66 | +FPIN_SUPPORT = 1 |
| 67 | |
| 68 | libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h |
| 69 | ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0) |
| 70 | -- |
| 71 | 2.25.1 |
| 72 | |