diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 15:04:38 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:32 +0000 |
| commit | b48b7b4109868a8c0ddda090992e936e821c7ea6 (patch) | |
| tree | 696be8ea782f2548c0f63bb0188f4c8d3eeed681 /import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch | |
| parent | d849ec78de728ef9a2d383b92ccfeabf40f8f1d0 (diff) | |
| download | blackbird-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.tar.gz blackbird-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.zip | |
Squashed 'import-layers/meta-openembedded/' content from commit 247b126
Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch')
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch new file mode 100644 index 000000000..89d2352da --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch @@ -0,0 +1,44 @@ +Always use devmapper + +Do not try to compute several _API_ make variables +from host information when cross-compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +diff --git a/libmultipath/Makefile b/libmultipath/Makefile +index e5b06b3..efd6cf6 100644 +--- a/libmultipath/Makefile ++++ b/libmultipath/Makefile +@@ -17,23 +17,18 @@ OBJS = memory.o parser.o vector.o devmapper.o \ + log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \ + lock.o waiter.o file.o wwids.o + +-LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h) + +-ifneq ($(strip $(LIBDM_API_FLUSH)),0) ++#ifneq ($(strip $(LIBDM_API_FLUSH)),0) + CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE +-endif ++#endif + +-LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) +- +-ifneq ($(strip $(LIBDM_API_COOKIE)),0) ++#ifneq ($(strip $(LIBDM_API_COOKIE)),0) + CFLAGS += -DLIBDM_API_COOKIE +-endif +- +-LIBUDEV_API_RECVBUF = $(shell grep -Ecs '^[a-z]*[[:space:]]+udev_monitor_set_resolve_buffer_size' /usr/include/libudev.h) ++#endif + +-ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) ++#ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) + CFLAGS += -DLIBUDEV_API_RECVBUF +-endif ++#endif + + + all: $(LIBS) |
