mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-15 06:10:02 +00:00
Patrick Ohly
bc34c97efc
No particular reason for updating besides following upstream. Only kpartx has been tested after updating! Seems to work as before; unfortunately that means that as in 0.5.0, "kpartx -d" doesn't do anything. Upstream refreshed the COPYING file, hence the checksum change: $ git log --oneline 0.5.0..HEAD COPYING bf05f63 multipath-tools: replace COPYING with a fresh copy from gnu.org 1d6c88a Update FSF address The QA error that do-not-link-libmpathpersist-to-TMPDIR.patch fixes no longer occurs because upstream changed that particular part of the Makefile. A new patch is needed to avoid building libcheckerrdb, which depends on the (currently) unavailable librados. The other patches had to be refreshed. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From c4f0dba4e86bfa20252fcc8218398e7468ca9149 Mon Sep 17 00:00:00 2001
|
|
From: Aws Ismail <aws.ismail@windriver.com>
|
|
Date: Mon, 22 Sep 2014 17:22:32 -0700
|
|
Subject: [PATCH] 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>
|
|
---
|
|
libmultipath/Makefile | 27 ++++-----------------------
|
|
1 file changed, 4 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/libmultipath/Makefile b/libmultipath/Makefile
|
|
index 495cebe..9626e69 100644
|
|
--- a/libmultipath/Makefile
|
|
+++ b/libmultipath/Makefile
|
|
@@ -20,29 +20,10 @@ ifdef SYSTEMD
|
|
endif
|
|
endif
|
|
|
|
-LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h)
|
|
-
|
|
-ifneq ($(strip $(LIBDM_API_FLUSH)),0)
|
|
- CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE
|
|
-endif
|
|
-
|
|
-LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h)
|
|
-
|
|
-ifneq ($(strip $(LIBDM_API_COOKIE)),0)
|
|
- CFLAGS += -DLIBDM_API_COOKIE
|
|
-endif
|
|
-
|
|
-LIBUDEV_API_RECVBUF = $(shell grep -Ecs '^[a-z]*[[:space:]]+udev_monitor_set_receive_buffer_size' /usr/include/libudev.h)
|
|
-
|
|
-ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0)
|
|
- CFLAGS += -DLIBUDEV_API_RECVBUF
|
|
-endif
|
|
-
|
|
-LIBDM_API_DEFERRED = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_deferred_remove' /usr/include/libdevmapper.h)
|
|
-
|
|
-ifneq ($(strip $(LIBDM_API_DEFERRED)),0)
|
|
- CFLAGS += -DLIBDM_API_DEFERRED
|
|
-endif
|
|
+CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE
|
|
+CFLAGS += -DLIBDM_API_COOKIE
|
|
+CFLAGS += -DLIBUDEV_API_RECVBUF
|
|
+CFLAGS += -DLIBDM_API_DEFERRED
|
|
|
|
OBJS = memory.o parser.o vector.o devmapper.o callout.o \
|
|
hwtable.o blacklist.o util.o dmparser.o config.o \
|
|
--
|
|
2.11.0
|
|
|