diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-07-05 05:13:17 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-14 23:44:30 +0200 |
commit | 1acfde8120eaa290df64f709e5a322bd6a44d19c (patch) | |
tree | 13d387707da99934f98ba276efe497f0d8c40388 /meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch | |
parent | 5688c8e24cf106f8248ea44e98ba15931844ed9b (diff) | |
download | meta-openembedded-1acfde8120eaa290df64f709e5a322bd6a44d19c.tar.gz |
multipath-tools: 0.6.4 -> 0.7.1
1. In fedora/redhat, it is renamed to device-mapper-multipath,
use PROVIDE and RPROVIDE to support.
2. Split ${PN}-libs
3. Add multipath.conf.example
4. Backport patches from fedora:
git://pkgs.fedoraproject.org/rpms/device-mapper-multipath
- 0001 ~ 0011
5. Rebase local patches:
- makefile_inc.patch -> 0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
- always-use-libdevmapper.patch -> 0013-Always-use-devmapper.patch
- always-use-libdevmapper-kpartx.patch -> 0014-Always-use-devmapper-for-kpartx.patch
6. Drop obsolete patches:
- 0001-multipathd.service-Error-fix.patch
- shared-libs-avoid-linking-.so-as-executable.patch
- checkers-disable-libcheckrbd.so.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch')
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch deleted file mode 100644 index 33834f6b80..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From c4f0dba4e86bfa20252fcc8218398e7468ca9149 Mon Sep 17 00:00:00 2001 | ||
2 | From: Aws Ismail <aws.ismail@windriver.com> | ||
3 | Date: Mon, 22 Sep 2014 17:22:32 -0700 | ||
4 | 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 | libmultipath/Makefile | 27 ++++----------------------- | ||
15 | 1 file changed, 4 insertions(+), 23 deletions(-) | ||
16 | |||
17 | diff --git a/libmultipath/Makefile b/libmultipath/Makefile | ||
18 | index 495cebe..9626e69 100644 | ||
19 | --- a/libmultipath/Makefile | ||
20 | +++ b/libmultipath/Makefile | ||
21 | @@ -20,29 +20,10 @@ ifdef SYSTEMD | ||
22 | endif | ||
23 | endif | ||
24 | |||
25 | -LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h) | ||
26 | - | ||
27 | -ifneq ($(strip $(LIBDM_API_FLUSH)),0) | ||
28 | - CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE | ||
29 | -endif | ||
30 | - | ||
31 | -LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) | ||
32 | - | ||
33 | -ifneq ($(strip $(LIBDM_API_COOKIE)),0) | ||
34 | - CFLAGS += -DLIBDM_API_COOKIE | ||
35 | -endif | ||
36 | - | ||
37 | -LIBUDEV_API_RECVBUF = $(shell grep -Ecs '^[a-z]*[[:space:]]+udev_monitor_set_receive_buffer_size' /usr/include/libudev.h) | ||
38 | - | ||
39 | -ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) | ||
40 | - CFLAGS += -DLIBUDEV_API_RECVBUF | ||
41 | -endif | ||
42 | - | ||
43 | -LIBDM_API_DEFERRED = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_deferred_remove' /usr/include/libdevmapper.h) | ||
44 | - | ||
45 | -ifneq ($(strip $(LIBDM_API_DEFERRED)),0) | ||
46 | - CFLAGS += -DLIBDM_API_DEFERRED | ||
47 | -endif | ||
48 | +CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE | ||
49 | +CFLAGS += -DLIBDM_API_COOKIE | ||
50 | +CFLAGS += -DLIBUDEV_API_RECVBUF | ||
51 | +CFLAGS += -DLIBDM_API_DEFERRED | ||
52 | |||
53 | OBJS = memory.o parser.o vector.o devmapper.o callout.o \ | ||
54 | hwtable.o blacklist.o util.o dmparser.o config.o \ | ||
55 | -- | ||
56 | 2.11.0 | ||
57 | |||