mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 17:59:59 +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>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 7267cf235fc052eaa1ca36e437096576edacb131 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 for kpartx
|
|
|
|
Do not try to compute the LIBDM_API_COOKIE make variable
|
|
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>
|
|
---
|
|
kpartx/Makefile | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/kpartx/Makefile b/kpartx/Makefile
|
|
index e8a59f2..e694a65 100644
|
|
--- a/kpartx/Makefile
|
|
+++ b/kpartx/Makefile
|
|
@@ -7,11 +7,7 @@ CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|
|
|
LIBDEPS += -ldevmapper
|
|
|
|
-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
|
|
+CFLAGS += -DLIBDM_API_COOKIE
|
|
|
|
OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
|
|
gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
|
|
--
|
|
2.11.0
|
|
|