summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2022-12-12 12:49:55 +0200
committerKhem Raj <raj.khem@gmail.com>2022-12-12 11:17:23 -0800
commit95236b15842f4324a0ab8b743aa504931a511b69 (patch)
tree292eec1d2c0ca0588c09f095f717f774a743c792
parent3fc877d6031da40c88d949602fabdc2b43d52ab2 (diff)
downloadmeta-openembedded-95236b15842f4324a0ab8b743aa504931a511b69.tar.gz
multipath-tools: upgrade 0.8.4 -> 0.9.3
* most patches were rebased on top of 0.9.3 with various small adjustments. * the following patches were dropped: 0001-fix-boolean-value-with-json-c-0.14.patch 0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch replaced by upstream commits: 82129852d747 ("fix boolean value with json-c 0.14") 54349bcfc818 ("libmultipath: avoid buffer size warning with systemd 240+") * prefix, usrlibdir, plugindir, modulesloaddir, and tmpfilesdir were added to EXTRA_OEMAKE to fix QA. * libgcc was added to RDEPENDS in order to fix the following startup error: "libgcc_s.so.1 must be installed for pthread_cancel to work" Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch24
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch42
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch33
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch39
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch40
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch25
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch58
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch44
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch61
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch17
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch82
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch14
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch59
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch16
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch14
-rw-r--r--meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb (renamed from meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb)11
16 files changed, 257 insertions, 322 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch
index 2827bb8745..3b0a704480 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch
@@ -1,4 +1,4 @@
1From 04884263d1de8c427a7a15bd1cf6466ea65d3a0b Mon Sep 17 00:00:00 2001 1From ee9f7b6e764be5668bc958f8bb97a46e5056d050 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 25 May 2020 23:22:55 -0700 3Date: Mon, 25 May 2020 23:22:55 -0700
4Subject: [PATCH] add explicit dependency on libraries 4Subject: [PATCH] add explicit dependency on libraries
@@ -17,24 +17,24 @@ ln -sf libmpathpersist.so.0 libmpathpersist.so
17Upstream-Status: Pending 17Upstream-Status: Pending
18 18
19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
20[OP: Rebase to 0.9.3]
21Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
20--- 22---
21 Makefile | 3 ++- 23 Makefile | 1 +
22 1 file changed, 2 insertions(+), 1 deletion(-) 24 1 file changed, 1 insertion(+)
23 25
24diff --git a/Makefile b/Makefile 26diff --git a/Makefile b/Makefile
25index bea0a0b2..37a77129 100644 27index f195b570..2d22881c 100644
26--- a/Makefile 28--- a/Makefile
27+++ b/Makefile 29+++ b/Makefile
28@@ -29,7 +29,8 @@ $(BUILDDIRS): 30@@ -78,6 +78,7 @@ libmultipath: libmpathutil
29 $(MAKE) -C $@ 31 libmpathpersist libmpathvalid multipath multipathd: libmultipath
30 32 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
31 multipath multipathd mpathpersist libmpathpersist : libmultipath 33 mpathpersist multipathd: libmpathpersist
32-mpathpersist: libmpathpersist 34+libmultipath mpathpersist multipath multipathd: libmpathcmd
33+mpathpersist multipathd: libmpathpersist
34+libdmmp libmultipath mpathpersist multipath multipathd: libmpathcmd
35 35
36 DEPS_ON_MULTIPATH := \ 36 DEPS_ON_MULTIPATH := \
37 multipath \ 37 multipath \
38-- 38--
392.21.0 392.38.1
40 40
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
deleted file mode 100644
index cf97b491e1..0000000000
--- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 3 Jun 2020 16:03:56 -0700
4Subject: [PATCH] fix boolean value with json-c 0.14
5
6Patch from Christian Hesse posted here
7https://www.spinics.net/lists/dm-devel/msg40646.html
8
9Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit
100992aac61f8b087efd7094e9ac2b84fa9c040fcd.
11
12Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 libdmmp/libdmmp_private.h | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
19index ac85b63f..29400826 100644
20--- a/libdmmp/libdmmp_private.h
21+++ b/libdmmp/libdmmp_private.h
22@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
23 do { \
24 json_type j_type = json_type_null; \
25 json_object *j_obj_tmp = NULL; \
26- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
27+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
28 _error(ctx, "Invalid JSON output from multipathd IPC: " \
29 "key '%s' not found", key); \
30 rc = DMMP_ERR_IPC_ERROR; \
31@@ -90,7 +90,7 @@ do { \
32 } \
33 if (j_obj_tmp == NULL) { \
34 _error(ctx, "BUG: Got NULL j_obj_tmp from " \
35- "json_object_object_get_ex() while it return TRUE"); \
36+ "json_object_object_get_ex() while it return 1"); \
37 rc = DMMP_ERR_BUG; \
38 goto out; \
39 } \
40--
412.27.0
42
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch
index ac87337694..97425fe9b8 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch
@@ -1,4 +1,4 @@
1From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001 1From 51f1f351262a31d94c10504e4d135526c6a7caeb Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@cn.fujitsu.com> 2From: Wang Mingyu <wangmy@cn.fujitsu.com>
3Date: Sun, 10 May 2020 21:22:53 +0800 3Date: Sun, 10 May 2020 21:22:53 +0800
4Subject: [PATCH] fix bug of do_compile and do_install 4Subject: [PATCH] fix bug of do_compile and do_install
@@ -7,27 +7,24 @@ when multiple processes make run in parallel,
7because of dependency error will occur. 7because of dependency error will occur.
8 8
9Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> 9Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
10
11[OP: Rebase to 0.9.3]
12[OP: Drop dependencies that are already present in the 0.9.3 Makefile]
13Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
10--- 14---
11 Makefile | 15 ++++++++++++++- 15 Makefile | 10 ++++++++++
12 1 file changed, 14 insertions(+), 1 deletion(-) 16 1 file changed, 10 insertions(+)
13 17
14diff --git a/Makefile b/Makefile 18diff --git a/Makefile b/Makefile
15index 1dee3680..bea0a0b2 100644 19index 27b4641f..f195b570 100644
16--- a/Makefile 20--- a/Makefile
17+++ b/Makefile 21+++ b/Makefile
18@@ -28,9 +28,22 @@ all: $(BUILDDIRS) 22@@ -79,6 +79,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
19 $(BUILDDIRS): 23 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
20 $(MAKE) -C $@ 24 mpathpersist multipathd: libmpathpersist
21
22-multipath multipathd mpathpersist: libmultipath
23+multipath multipathd mpathpersist libmpathpersist : libmultipath
24 mpathpersist: libmpathpersist
25 25
26+DEPS_ON_MULTIPATH := \ 26+DEPS_ON_MULTIPATH := \
27+ multipath \ 27+ multipath \
28+ libmultipath/prioritizers \
29+ libmultipath/checkers \
30+ libmultipath/foreign \
31+ multipathd \ 28+ multipathd \
32+ mpathpersist \ 29+ mpathpersist \
33+ libmpathpersist 30+ libmpathpersist
@@ -36,9 +33,9 @@ index 1dee3680..bea0a0b2 100644
36+mpathpersist.install: libmpathpersist.install 33+mpathpersist.install: libmpathpersist.install
37+libdmmp.install libmultipath/foreign.install: mpathpersist.install 34+libdmmp.install libmultipath/foreign.install: mpathpersist.install
38+ 35+
39 $(BUILDDIRS.clean): 36 libmultipath/checkers.install \
40 $(MAKE) -C ${@:.clean=} clean 37 libmultipath/prioritizers.install \
41 38 libmultipath/foreign.install: libmultipath.install
42-- 39--
432.17.1 402.38.1
44 41
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch
deleted file mode 100644
index d261b13d91..0000000000
--- a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 8579d8a35886f91974e0ac4dbdf2edb7dac06d52 Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Fri, 18 Dec 2020 11:17:50 +0800
4Subject: [PATCH] libmultipath/uevent.c: fix error handling for
5 udev_monitor_set_receive_buffer_size
6
7Since systemd v246.5[1], udev_monitor_set_receive_buffer_size() will
8return 0 or 1 if successful. We only need to check a negative value for
9the failure.
10
11[1] https://github.com/systemd/systemd-stable/commit/4dcae666889ae9469e4406c0bcaffadbc01c4f66
12 https://github.com/systemd/systemd-stable/commit/fe9b92e566f837665cc06c82374e4e42f9295c99
13 https://github.com/systemd/systemd-stable/commit/5dd4cc4b10daea5d2ba969425ba02d2098dd06a4
14
15Upstream-Status: Pending
16
17Signed-off-by: Joe Slater <joe.slater@windriver.com>
18Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19---
20 libmultipath/uevent.c | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-)
22
23diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c
24index d38e8a7f..4b298052 100644
25--- a/libmultipath/uevent.c
26+++ b/libmultipath/uevent.c
27@@ -810,7 +810,8 @@ int uevent_listen(struct udev *udev)
28 }
29 pthread_cleanup_push(monitor_cleanup, monitor);
30 #ifdef LIBUDEV_API_RECVBUF
31- if (udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024))
32+ err = udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024);
33+ if (err < 0)
34 condlog(2, "failed to increase buffer size");
35 #endif
36 fd = udev_monitor_get_fd(monitor);
37--
382.17.1
39
diff --git a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch
index e88e25617d..0b9971dc99 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch
@@ -1,4 +1,4 @@
1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 1From 9a941729d3c0d19d30d65e16b291c380e589eeb3 Mon Sep 17 00:00:00 2001
2From: Benjamin Marzinski <bmarzins@redhat.com> 2From: Benjamin Marzinski <bmarzins@redhat.com>
3Date: Thu, 13 Apr 2017 07:22:23 -0500 3Date: Thu, 13 Apr 2017 07:22:23 -0500
4Subject: [PATCH] RH: fixup udev rules for redhat 4Subject: [PATCH] RH: fixup udev rules for redhat
@@ -14,6 +14,8 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
14Update patch to 0.8.0 14Update patch to 0.8.0
15 15
16Signed-off-by: Changqing Li <changqing.li@windriver.com> 16Signed-off-by: Changqing Li <changqing.li@windriver.com>
17[OP: Rebase to 0.9.3]
18Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
17--- 19---
18 Makefile.inc | 2 +- 20 Makefile.inc | 2 +-
19 kpartx/kpartx.rules | 2 +- 21 kpartx/kpartx.rules | 2 +-
@@ -21,23 +23,23 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
21 3 files changed, 4 insertions(+), 4 deletions(-) 23 3 files changed, 4 insertions(+), 4 deletions(-)
22 24
23diff --git a/Makefile.inc b/Makefile.inc 25diff --git a/Makefile.inc b/Makefile.inc
24index fc728ca..2f0bcea 100644 26index 4d843ce5..57779fd8 100644
25--- a/Makefile.inc 27--- a/Makefile.inc
26+++ b/Makefile.inc 28+++ b/Makefile.inc
27@@ -48,7 +48,7 @@ endif 29@@ -81,7 +81,7 @@ endif
28 prefix = 30 prefix =
29 exec_prefix = $(prefix) 31 exec_prefix = $(prefix)
30 usr_prefix = $(prefix) 32 usr_prefix = $(prefix)
31-bindir = $(exec_prefix)/sbin 33-bindir = $(exec_prefix)/sbin
32+bindir = $(exec_prefix)/usr/sbin 34+bindir = $(exec_prefix)/usr/sbin
33 libudevdir = $(prefix)/$(SYSTEMDPATH)/udev 35 libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
36 tmpfilesdir = $(prefix)/$(SYSTEMDPATH)/tmpfiles.d
34 udevrulesdir = $(libudevdir)/rules.d 37 udevrulesdir = $(libudevdir)/rules.d
35 multipathdir = $(TOPDIR)/libmultipath
36diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules 38diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
37index 8f99049..8a3a171 100644 39index 1969dee0..d2b28233 100644
38--- a/kpartx/kpartx.rules 40--- a/kpartx/kpartx.rules
39+++ b/kpartx/kpartx.rules 41+++ b/kpartx/kpartx.rules
40@@ -32,6 +32,6 @@ LABEL="mpath_kpartx_end" 42@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
41 GOTO="kpartx_end" 43 GOTO="kpartx_end"
42 44
43 LABEL="run_kpartx" 45 LABEL="run_kpartx"
@@ -46,27 +48,27 @@ index 8f99049..8a3a171 100644
46 48
47 LABEL="kpartx_end" 49 LABEL="kpartx_end"
48diff --git a/multipath/Makefile b/multipath/Makefile 50diff --git a/multipath/Makefile b/multipath/Makefile
49index 0828a8f..b9bbb3c 100644 51index 116348e2..8482de6a 100644
50--- a/multipath/Makefile 52--- a/multipath/Makefile
51+++ b/multipath/Makefile 53+++ b/multipath/Makefile
52@@ -24,7 +24,7 @@ install: 54@@ -23,7 +23,7 @@ install:
53 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ 55 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
54 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) 56 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
55 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) 57 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
56- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules 58- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules
57+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules 59+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules
58 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) 60 $(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir)
59 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) 61 $(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf
60 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) 62 $(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir)
61@@ -33,7 +33,7 @@ install: 63@@ -43,7 +43,7 @@ uninstall:
62 uninstall:
63 $(RM) $(DESTDIR)$(bindir)/$(EXEC)
64 $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules 64 $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
65 $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf
66 $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf
65- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules 67- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
66+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules 68+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
67 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz 69 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
68 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz 70 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
69 71
70-- 72--
712.7.4 732.38.1
72 74
diff --git a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch
index 21b8ec6b06..0eff18b853 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -17,28 +17,27 @@ Upsteam-Status: Pending
17 17
18Update patch to 0.8.2 18Update patch to 0.8.2
19Signed-off-by: Changqing Li <changqing.li@windriver.com> 19Signed-off-by: Changqing Li <changqing.li@windriver.com>
20[OP: Rebase to 0.9.3]
21Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
20--- 22---
21 libmultipath/blacklist.c | 13 +++++-------- 23 libmultipath/blacklist.c | 10 +++++-----
22 1 file changed, 5 insertions(+), 8 deletions(-) 24 1 file changed, 5 insertions(+), 5 deletions(-)
23 25
24diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c 26diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
25index 00e8dbd..5204501 100644 27index 8d15d2ea..820b0d68 100644
26--- a/libmultipath/blacklist.c 28--- a/libmultipath/blacklist.c
27+++ b/libmultipath/blacklist.c 29+++ b/libmultipath/blacklist.c
28@@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) 30@@ -198,9 +198,6 @@ setup_default_blist (struct config * conf)
29 char * str; 31 struct hwentry *hwe;
30 int i; 32 int i;
31 33
32- str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]"); 34- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", ORIGIN_DEFAULT))
33- if (!str)
34- return 1;
35- if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
36- return 1; 35- return 1;
37- 36-
38 str = STRDUP("^(td|hd|vd)[a-z]"); 37 if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT))
39 if (!str)
40 return 1; 38 return 1;
41@@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl, 39
40@@ -435,8 +432,11 @@ filter_property(const struct config *conf, struct udev_device *udev,
42 r = MATCH_NOTHING; 41 r = MATCH_NOTHING;
43 } 42 }
44 43
@@ -53,5 +52,5 @@ index 00e8dbd..5204501 100644
53 52
54 static void free_ble(struct blentry *ble) 53 static void free_ble(struct blentry *ble)
55-- 54--
562.7.4 552.38.1
57 56
diff --git a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch
index ea6137f878..840b00093d 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch
@@ -1,4 +1,4 @@
1From 0bf8ff8dab26201b268b419809844c07e168f17d Mon Sep 17 00:00:00 2001 1From 056fdaece0f1a3a5ca92e8c08912730faa89875d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 23 Nov 2018 17:25:15 +0800 3Date: Fri, 23 Nov 2018 17:25:15 +0800
4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17
@@ -19,30 +19,32 @@ Upstream-Status: Pending
19 19
20update this patch to new version 20update this patch to new version
21Signed-off-by: Changqing Li <changqing.li@windriver.com> 21Signed-off-by: Changqing Li <changqing.li@windriver.com>
22[OP: Rebase to 0.9.3]
23Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
22--- 24---
23 libmultipath/config.c | 18 ++++++++++++++++++ 25 libmultipath/config.c | 18 ++++++++++++++++++
24 libmultipath/config.h | 1 + 26 libmultipath/config.h | 1 +
25 multipath/multipath.rules | 1 + 27 multipath/multipath.rules.in | 1 +
26 multipathd/multipathd.8 | 2 ++ 28 multipathd/multipathd.8 | 2 ++
27 multipathd/multipathd.service | 1 + 29 multipathd/multipathd.service | 1 +
28 5 files changed, 23 insertions(+) 30 5 files changed, 23 insertions(+)
29 31
30diff --git a/libmultipath/config.c b/libmultipath/config.c 32diff --git a/libmultipath/config.c b/libmultipath/config.c
31index 5af7af5..e4233f1 100644 33index 5c5c0726..31894810 100644
32--- a/libmultipath/config.c 34--- a/libmultipath/config.c
33+++ b/libmultipath/config.c 35+++ b/libmultipath/config.c
34@@ -26,6 +26,7 @@ 36@@ -26,6 +26,7 @@
35 #include "devmapper.h"
36 #include "mpath_cmd.h" 37 #include "mpath_cmd.h"
37 #include "propsel.h" 38 #include "propsel.h"
39 #include "foreign.h"
38+#include "version.h" 40+#include "version.h"
39 41
40 static int 42 /*
41 hwe_strmatch (const struct hwentry *hwe1, const struct hwentry *hwe2) 43 * We don't support re-initialization after
42@@ -743,6 +745,23 @@ load_config (char * file) 44@@ -966,6 +967,23 @@ int _init_config (const char *file, struct config *conf)
43 goto out;
44 } 45 }
45 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); 46 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
47 validate_pctable(conf->overrides, 0, file);
46+ } else { 48+ } else {
47+ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); 49+ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
48+ if (conf->blist_devnode == NULL) { 50+ if (conf->blist_devnode == NULL) {
@@ -64,21 +66,21 @@ index 5af7af5..e4233f1 100644
64 66
65 conf->processed_main_config = 1; 67 conf->processed_main_config = 1;
66diff --git a/libmultipath/config.h b/libmultipath/config.h 68diff --git a/libmultipath/config.h b/libmultipath/config.h
67index 7d0cd9a..d7fb8e2 100644 69index 87947469..0dc89c16 100644
68--- a/libmultipath/config.h 70--- a/libmultipath/config.h
69+++ b/libmultipath/config.h 71+++ b/libmultipath/config.h
70@@ -9,6 +9,7 @@ 72@@ -10,6 +10,7 @@
71 73
72 #define ORIGIN_DEFAULT 0 74 #define ORIGIN_DEFAULT 0
73 #define ORIGIN_CONFIG 1 75 #define ORIGIN_CONFIG 1
74+#define ORIGIN_NO_CONFIG 2 76+#define ORIGIN_NO_CONFIG 2
75 77
76 /* 78 enum devtypes {
77 * In kernel, fast_io_fail == 0 means immediate failure on rport delete. 79 DEV_NONE,
78diff --git a/multipath/multipath.rules b/multipath/multipath.rules 80diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
79index 9df11a9..0486bf7 100644 81index 8d3cf33a..5c4447a2 100644
80--- a/multipath/multipath.rules 82--- a/multipath/multipath.rules.in
81+++ b/multipath/multipath.rules 83+++ b/multipath/multipath.rules.in
82@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" 84@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
83 ENV{nompath}=="?*", GOTO="end_mpath" 85 ENV{nompath}=="?*", GOTO="end_mpath"
84 IMPORT{cmdline}="multipath" 86 IMPORT{cmdline}="multipath"
@@ -88,30 +90,30 @@ index 9df11a9..0486bf7 100644
88 ENV{DEVTYPE}!="partition", GOTO="test_dev" 90 ENV{DEVTYPE}!="partition", GOTO="test_dev"
89 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" 91 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
90diff --git a/multipathd/multipathd.8 b/multipathd/multipathd.8 92diff --git a/multipathd/multipathd.8 b/multipathd/multipathd.8
91index 94c3f97..ed13efd 100644 93index bdf102eb..a16a0bd5 100644
92--- a/multipathd/multipathd.8 94--- a/multipathd/multipathd.8
93+++ b/multipathd/multipathd.8 95+++ b/multipathd/multipathd.8
94@@ -38,6 +38,8 @@ map regains its maximum performance and redundancy. 96@@ -48,6 +48,8 @@ map regains its maximum performance and redundancy.
95 This daemon executes the external \fBmultipath\fR tool when events occur. 97 With the \fB-k\fR option, \fBmultipathd\fR acts as a client utility that
96 In turn, the multipath tool signals the multipathd daemon when it is done with 98 sends commands to a running instance of the multipathd daemon (see
97 devmap reconfiguration, so that it can refresh its failed path list. 99 \fBCOMMANDS\fR below).
98+ 100+
99+In this Linux distribution, multipathd does not run unless a /etc/multipath.conf file exists. 101+In this Linux distribution, multipathd does not run unless a /etc/multipath.conf file exists.
100 . 102 .
101 . 103 .
102 .\" ---------------------------------------------------------------------------- 104 .\" ----------------------------------------------------------------------------
103diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service 105diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
104index ba24983..17434ce 100644 106index aec62dbb..ab7585de 100644
105--- a/multipathd/multipathd.service 107--- a/multipathd/multipathd.service
106+++ b/multipathd/multipathd.service 108+++ b/multipathd/multipathd.service
107@@ -4,6 +4,7 @@ Wants=systemd-udev-trigger.service systemd-udev-settle.service 109@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
108 Before=iscsi.service iscsid.service lvm2-activation-early.service 110 Wants=systemd-udevd-kernel.socket
109 Before=local-fs-pre.target blk-availability.service 111 After=systemd-udevd-kernel.socket
110 After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service 112 After=multipathd.socket systemd-remount-fs.service
111+ConditionPathExists=/etc/multipath.conf 113+ConditionPathExists=/etc/multipath.conf
114 Before=initrd-cleanup.service
112 DefaultDependencies=no 115 DefaultDependencies=no
113 Conflicts=shutdown.target 116 Conflicts=shutdown.target
114 ConditionKernelCommandLine=!nompath
115-- 117--
1162.7.4 1182.38.1
117 119
diff --git a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch
index 17542fd4fd..e7b3e12238 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch
@@ -1,7 +1,8 @@
1From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 1From cc38276a5d3926fd96e58366e15ba887d7d02ed0 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 09:19:17 +0800 3Date: Mon, 26 Nov 2018 09:19:17 +0800
4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep
5
517 617
6 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 7 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed,
719 819
@@ -19,21 +20,29 @@ Upstream-Status: Pending
19update this patch to new version 20update this patch to new version
20 21
21Signed-off-by: Changqing Li <changqing.li@windriver.com> 22Signed-off-by: Changqing Li <changqing.li@windriver.com>
23[OP: Rebase to 0.9.3]
24Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
22--- 25---
23 Makefile.inc | 24 ++++++++++++++++-------- 26 Makefile.inc | 28 ++++++++++++++++++----------
24 1 file changed, 16 insertions(+), 8 deletions(-) 27 1 file changed, 18 insertions(+), 10 deletions(-)
25 28
26diff --git a/Makefile.inc b/Makefile.inc 29diff --git a/Makefile.inc b/Makefile.inc
27index 42dbb5bf..55a06c60 100644 30index 57779fd8..34f2cc6d 100644
28--- a/Makefile.inc 31--- a/Makefile.inc
29+++ b/Makefile.inc 32+++ b/Makefile.inc
30@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \ 33@@ -140,20 +140,28 @@ FORTIFY_OPT := $(shell \
31 echo "$(2)"; \ 34 echo "-D_FORTIFY_SOURCE=2"; \
32 fi) 35 fi)
33 36
34-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) 37-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
35-ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) 38-ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
36-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,) 39-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
40-WFORMATOVERFLOW := $(call TEST_CC_OPTION,-Wformat-overflow=2,)
41-
42-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
43-WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
44- -Werror=implicit-function-declaration -Werror=format-security \
45- $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
37+ifndef RPM_OPT_FLAGS 46+ifndef RPM_OPT_FLAGS
38+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) 47+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
39+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ 48+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \
@@ -50,15 +59,16 @@ index 42dbb5bf..55a06c60 100644
50+ -Werror=implicit-function-declaration -Wno-sign-compare \ 59+ -Werror=implicit-function-declaration -Wno-sign-compare \
51+ -Wno-unused-parameter -Werror=cast-qual \ 60+ -Wno-unused-parameter -Werror=cast-qual \
52+ -Werror=discarded-qualifiers 61+ -Werror=discarded-qualifiers
53 62+
54-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \ 63 CPPFLAGS := $(FORTIFY_OPT) \
55- -Werror=implicit-function-declaration -Werror=format-security \ 64 -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \
56- $(WNOCLOBBERED) \ 65 -DRUNTIME_DIR=\"$(runtimedir)\" \
57- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ 66 -DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
58- $(STACKPROT) --param=ssp-buffer-size=4 67-CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
59 CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 68+CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe
60 CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ 69 BIN_CFLAGS = -fPIE -DPIE
61 -MMD -MP $(CFLAGS) 70 LIB_CFLAGS = -fPIC
71 SHARED_FLAGS = -shared
62-- 72--
632.17.1 732.38.1
64 74
diff --git a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch
index a1407718d5..471ff09323 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch
@@ -1,4 +1,4 @@
1From eb5a36e6e0caedf06008e48eb77b7bf7c6534ee5 Mon Sep 17 00:00:00 2001 1From b0b4cca566e3e0c3a232b3754555c41d4e0c1273 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 09:55:12 +0800 3Date: Mon, 26 Nov 2018 09:55:12 +0800
4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17
@@ -19,21 +19,23 @@ Upstream-Status: Pending
19update this patch to new version 19update this patch to new version
20 20
21Signed-off-by: Changqing Li <changqing.li@windriver.com> 21Signed-off-by: Changqing Li <changqing.li@windriver.com>
22[OP: Rebase to 0.9.3]
23Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
22--- 24---
23 libmultipath/config.c | 1 + 25 libmultipath/config.c | 1 +
24 multipath/Makefile | 5 + 26 multipath/Makefile | 4 +
25 multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++ 27 multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++
26 multipath/mpathconf.8 | 101 +++++++++++ 28 multipath/mpathconf.8 | 101 +++++++++
27 4 files changed, 571 insertions(+) 29 4 files changed, 570 insertions(+)
28 create mode 100644 multipath/mpathconf 30 create mode 100644 multipath/mpathconf
29 create mode 100644 multipath/mpathconf.8 31 create mode 100644 multipath/mpathconf.8
30 32
31diff --git a/libmultipath/config.c b/libmultipath/config.c 33diff --git a/libmultipath/config.c b/libmultipath/config.c
32index e4233f1..b779505 100644 34index 31894810..af59dd3c 100644
33--- a/libmultipath/config.c 35--- a/libmultipath/config.c
34+++ b/libmultipath/config.c 36+++ b/libmultipath/config.c
35@@ -747,6 +747,7 @@ load_config (char * file) 37@@ -969,6 +969,7 @@ int _init_config (const char *file, struct config *conf)
36 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); 38 validate_pctable(conf->overrides, 0, file);
37 } else { 39 } else {
38 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); 40 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
39+ condlog(0, "You can run /sbin/mpathconf to create or modify /etc/multipath.conf"); 41+ condlog(0, "You can run /sbin/mpathconf to create or modify /etc/multipath.conf");
@@ -41,42 +43,39 @@ index e4233f1..b779505 100644
41 conf->blist_devnode = vector_alloc(); 43 conf->blist_devnode = vector_alloc();
42 if (!conf->blist_devnode) { 44 if (!conf->blist_devnode) {
43diff --git a/multipath/Makefile b/multipath/Makefile 45diff --git a/multipath/Makefile b/multipath/Makefile
44index b9bbb3c..e720c7f 100644 46index 8482de6a..780b1b73 100644
45--- a/multipath/Makefile 47--- a/multipath/Makefile
46+++ b/multipath/Makefile 48+++ b/multipath/Makefile
47@@ -18,10 +18,12 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so 49@@ -21,6 +21,7 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
48 $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
49 $(GZIP) $(EXEC).8 > $(EXEC).8.gz
50 $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
51+ $(GZIP) mpathconf.8 > mpathconf.8.gz
52
53 install: 50 install:
54 $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) 51 $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
55 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ 52 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
56+ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ 53+ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/
57 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) 54 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
58 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) 55 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
59 $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules 56 $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules
60@@ -29,13 +31,16 @@ install: 57@@ -32,6 +33,7 @@ install:
61 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) 58 $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
62 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) 59 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
63 $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) 60 $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
64+ $(INSTALL_PROGRAM) -m 644 mpathconf.8.gz $(DESTDIR)$(man8dir) 61+ $(INSTALL_PROGRAM) -m 644 mpathconf.8 $(DESTDIR)$(man8dir)
65 62 ifneq ($(SCSI_DH_MODULES_PRELOAD),)
66 uninstall: 63 $(INSTALL_PROGRAM) -m 644 scsi_dh.conf $(DESTDIR)$(modulesloaddir)/scsi_dh.conf
67 $(RM) $(DESTDIR)$(bindir)/$(EXEC) 64 for _x in $(SCSI_DH_MODULES_PRELOAD); do echo "$$_x"; done \
68 $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules 65@@ -44,8 +46,10 @@ uninstall:
66 $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf
67 $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf
69 $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules 68 $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
70+ $(RM) $(DESTDIR)$(bindir)/mpathconf 69+ $(RM) $(DESTDIR)$(bindir)/mpathconf
71 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz 70 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
72 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz 71 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
73+ $(RM) $(DESTDIR)$(man8dir)/mpathconf.8.gz 72+ $(RM) $(DESTDIR)$(man8dir)/mpathconf.8
74 73
75 clean: dep_clean 74 clean: dep_clean
76 $(RM) core *.o $(EXEC) *.gz 75 $(RM) core *.o $(EXEC) multipath.rules tmpfiles.conf
77diff --git a/multipath/mpathconf b/multipath/mpathconf 76diff --git a/multipath/mpathconf b/multipath/mpathconf
78new file mode 100644 77new file mode 100644
79index 0000000..e839134 78index 00000000..e8391347
80--- /dev/null 79--- /dev/null
81+++ b/multipath/mpathconf 80+++ b/multipath/mpathconf
82@@ -0,0 +1,464 @@ 81@@ -0,0 +1,464 @@
@@ -546,7 +545,7 @@ index 0000000..e839134
546+fi 545+fi
547diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8 546diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8
548new file mode 100644 547new file mode 100644
549index 0000000..4cd3267 548index 00000000..4cd32672
550--- /dev/null 549--- /dev/null
551+++ b/multipath/mpathconf.8 550+++ b/multipath/mpathconf.8
552@@ -0,0 +1,101 @@ 551@@ -0,0 +1,101 @@
@@ -652,5 +651,5 @@ index 0000000..4cd3267
652+.SH AUTHOR 651+.SH AUTHOR
653+Benjamin Marzinski <bmarzins@redhat.com> 652+Benjamin Marzinski <bmarzins@redhat.com>
654-- 653--
6552.7.4 6542.38.1
656 655
diff --git a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
index 5fd6d668e2..17c36e86c5 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,7 +1,8 @@
1From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 1From 262de33671ede81e424344ea9125d9e546cf8612 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 26 Sep 2019 16:29:48 +0800 3Date: Thu, 26 Sep 2019 16:29:48 +0800
4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep
5
517 617
6 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 7 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri,
717 817
@@ -25,19 +26,21 @@ Upstream-Status: Pending
25Update this patch to new version 0.8.2 26Update this patch to new version 0.8.2
26 27
27Signed-off-by: Changqing Li <changqing.li@windriver.com> 28Signed-off-by: Changqing Li <changqing.li@windriver.com>
29[OP: Rebase to 0.9.3]
30Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
28--- 31---
29 libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 32 libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
30 libmultipath/wwids.h | 1 + 33 libmultipath/wwids.h | 1 +
31 2 files changed, 45 insertions(+) 34 2 files changed, 45 insertions(+)
32 35
33diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c 36diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
34index 28a2150d..a0bfa851 100644 37index 89bb60ca..bab9aa85 100644
35--- a/libmultipath/wwids.c 38--- a/libmultipath/wwids.c
36+++ b/libmultipath/wwids.c 39+++ b/libmultipath/wwids.c
37@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \ 40@@ -451,3 +451,47 @@ int unmark_failed_wwid(const char *wwid)
38 declare_failed_wwid_op(is_failed, false) 41 print_failed_wwid_result("unmark_failed", wwid, r);
39 declare_failed_wwid_op(mark_failed, true) 42 return r;
40 declare_failed_wwid_op(unmark_failed, true) 43 }
41+ 44+
42+int remember_cmdline_wwid(void) 45+int remember_cmdline_wwid(void)
43+{ 46+{
@@ -95,5 +98,5 @@ index 0c6ee54d..e32a0b0e 100644
95 enum { 98 enum {
96 WWID_IS_NOT_FAILED = 0, 99 WWID_IS_NOT_FAILED = 0,
97-- 100--
982.17.1 1012.38.1
99 102
diff --git a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch
index c59edbbb27..22cb4beeb8 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch
@@ -15,26 +15,41 @@ Upstream-Status: Pending
15update this patch to 0.8.2 15update this patch to 0.8.2
16 16
17Signed-off-by: Changqing Li <changqing.li@windriver.com> 17Signed-off-by: Changqing Li <changqing.li@windriver.com>
18[OP: Rebase to 0.9.3]
19[OP: adjusted FREE() -> free(), made set_regex_value() static]
20Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
18--- 21---
19 libmultipath/dict.c | 29 ++++++++++++++++++++++------- 22 libmultipath/dict.c | 42 +++++++++++++++++++++++++++++++++++-------
20 libmultipath/parser.c | 13 +++++++++++++ 23 1 file changed, 35 insertions(+), 7 deletions(-)
21 libmultipath/parser.h | 1 +
22 3 files changed, 36 insertions(+), 7 deletions(-)
23 24
24diff --git a/libmultipath/dict.c b/libmultipath/dict.c 25diff --git a/libmultipath/dict.c b/libmultipath/dict.c
25index c6eba0f..05ed3d8 100644 26index aa93fe43..55a22d32 100644
26--- a/libmultipath/dict.c 27--- a/libmultipath/dict.c
27+++ b/libmultipath/dict.c 28+++ b/libmultipath/dict.c
28@@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) 29@@ -155,6 +155,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr)
30 return 0;
29 } 31 }
30 32
31 static int 33+static void *
32+set_regex(vector strvec, void *ptr) 34+set_regex_value(vector strvec)
35+{
36+ char *buff = set_value(strvec);
37+
38+ if (buff && strcmp("*", buff) == 0) {
39+ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\"");
40+ free(buff);
41+ return strdup(".*");
42+ }
43+ return buff;
44+}
45+
46+static int
47+set_regex(vector strvec, void *ptr, const char *file, int line_nr)
33+{ 48+{
34+ char **str_ptr = (char **)ptr; 49+ char **str_ptr = (char **)ptr;
35+ 50+
36+ if (*str_ptr) 51+ if (*str_ptr)
37+ FREE(*str_ptr); 52+ free(*str_ptr);
38+ *str_ptr = set_regex_value(strvec); 53+ *str_ptr = set_regex_value(strvec);
39+ 54+
40+ if (!*str_ptr) 55+ if (!*str_ptr)
@@ -43,11 +58,10 @@ index c6eba0f..05ed3d8 100644
43+ return 0; 58+ return 0;
44+} 59+}
45+ 60+
46+static int 61 static int
47 set_yes_no(vector strvec, void *ptr) 62 set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
48 { 63 {
49 char * buff; 64@@ -1679,8 +1707,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \
50@@ -1415,8 +1430,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \
51 \ 65 \
52 if (!conf->option) \ 66 if (!conf->option) \
53 return 1; \ 67 return 1; \
@@ -58,7 +72,7 @@ index c6eba0f..05ed3d8 100644
58 if (!buff) \ 72 if (!buff) \
59 return 1; \ 73 return 1; \
60 \ 74 \
61@@ -1432,7 +1447,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ 75@@ -1700,7 +1728,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
62 if (!conf->option) \ 76 if (!conf->option) \
63 return 1; \ 77 return 1; \
64 \ 78 \
@@ -67,7 +81,7 @@ index c6eba0f..05ed3d8 100644
67 if (!buff) \ 81 if (!buff) \
68 return 1; \ 82 return 1; \
69 \ 83 \
70@@ -1535,16 +1550,16 @@ device_handler(struct config *conf, vector strvec) 84@@ -1806,16 +1834,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
71 return 0; 85 return 0;
72 } 86 }
73 87
@@ -88,42 +102,6 @@ index c6eba0f..05ed3d8 100644
88 declare_hw_snprint(bl_product, print_str) 102 declare_hw_snprint(bl_product, print_str)
89 103
90 declare_hw_handler(hwhandler, set_str) 104 declare_hw_handler(hwhandler, set_str)
91diff --git a/libmultipath/parser.c b/libmultipath/parser.c
92index e00c5ff..6ca5842 100644
93--- a/libmultipath/parser.c
94+++ b/libmultipath/parser.c
95@@ -382,6 +382,19 @@ oom:
96 return NULL;
97 }
98
99+void *
100+set_regex_value(vector strvec)
101+{
102+ char *buff = set_value(strvec);
103+
104+ if (buff && strcmp("*", buff) == 0) {
105+ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\"");
106+ FREE(buff);
107+ return strdup(".*");
108+ }
109+ return buff;
110+}
111+
112 /* non-recursive configuration stream handler */
113 static int kw_level = 0;
114
115diff --git a/libmultipath/parser.h b/libmultipath/parser.h
116index 62906e9..b791705 100644
117--- a/libmultipath/parser.h
118+++ b/libmultipath/parser.h
119@@ -77,6 +77,7 @@ extern void dump_keywords(vector keydump, int level);
120 extern void free_keywords(vector keywords);
121 extern vector alloc_strvec(char *string);
122 extern void *set_value(vector strvec);
123+extern void *set_regex_value(vector strvec);
124 extern int process_file(struct config *conf, char *conf_file);
125 extern struct keyword * find_keyword(vector keywords, vector v, char * name);
126 int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw,
127-- 105--
1282.7.4 1062.38.1
129 107
diff --git a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch b/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
index 3919f99045..952009b1d5 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
@@ -1,4 +1,4 @@
1From c3436ec8a502a40579abf62be0a479fa9d7888ad Mon Sep 17 00:00:00 2001 1From d139474f2a6d87c1cd20dfbb916fe650bfcce968 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 4 Jun 2019 11:39:39 +0800 3Date: Tue, 4 Jun 2019 11:39:39 +0800
4Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation 4Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation
@@ -26,21 +26,23 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
26 26
27update for version 0.8.1 27update for version 0.8.1
28Signed-off-by: Changqing Li <changqing.li@windriver.com> 28Signed-off-by: Changqing Li <changqing.li@windriver.com>
29[OP: Rebase to 0.9.3]
30Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
29--- 31---
30 Makefile.inc | 11 ----------- 32 Makefile.inc | 11 -----------
31 1 file changed, 11 deletions(-) 33 1 file changed, 11 deletions(-)
32 34
33diff --git a/Makefile.inc b/Makefile.inc 35diff --git a/Makefile.inc b/Makefile.inc
34index 661f141..3f9fd28 100644 36index 34f2cc6d..ee6a4c9f 100644
35--- a/Makefile.inc 37--- a/Makefile.inc
36+++ b/Makefile.inc 38+++ b/Makefile.inc
37@@ -35,17 +35,6 @@ ifndef RUN 39@@ -42,17 +42,6 @@ ifndef RUN
38 endif 40 endif
39 endif 41 endif
40 42
41-ifndef SYSTEMD 43-ifndef SYSTEMD
42- ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) 44- ifeq ($(shell $(PKGCONFIG) --modversion libsystemd >/dev/null 2>&1 && echo 1), 1)
43- SYSTEMD = $(shell pkg-config --modversion libsystemd) 45- SYSTEMD = $(shell $(PKGCONFIG) --modversion libsystemd | awk '{print $$1}')
44- else 46- else
45- ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) 47- ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1)
46- SYSTEMD = $(shell systemctl --version 2> /dev/null | \ 48- SYSTEMD = $(shell systemctl --version 2> /dev/null | \
@@ -53,5 +55,5 @@ index 661f141..3f9fd28 100644
53 SYSTEMDPATH=usr/lib 55 SYSTEMDPATH=usr/lib
54 endif 56 endif
55-- 57--
562.7.4 582.38.1
57 59
diff --git a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch
index 3e88b41004..c2025ed6ff 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch
@@ -1,7 +1,7 @@
1From e4acb46b10484d1da6f093257e34f269832e6a37 Mon Sep 17 00:00:00 2001 1From f20d7651a62efff818ebd0d1bc920f6f362c890d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 11:17:41 +0800 3Date: Mon, 26 Nov 2018 11:17:41 +0800
4Subject: [PATCH] Subject: [PATCH] Always use devmapper 4Subject: [PATCH] Subject: [PATCH] Always use devmapper
5 5
6Do not try to compute several _API_ make variables 6Do not try to compute several _API_ make variables
7from host information when cross-compiling. 7from host information when cross-compiling.
@@ -21,40 +21,57 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
21 21
22Rebase to 0.7.9 22Rebase to 0.7.9
23Signed-off-by: Changqing Li <changqing.li@windriver.com> 23Signed-off-by: Changqing Li <changqing.li@windriver.com>
24[OP: Rebase to 0.9.3]
25Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
24--- 26---
25 libmultipath/Makefile | 19 ++++--------------- 27 libmultipath/Makefile | 34 +++++++---------------------------
26 1 file changed, 4 insertions(+), 15 deletions(-) 28 1 file changed, 7 insertions(+), 27 deletions(-)
27 29
28diff --git a/libmultipath/Makefile b/libmultipath/Makefile 30diff --git a/libmultipath/Makefile b/libmultipath/Makefile
29index 33f5269..adf6f4a 100644 31index 3b60a525..72aca7ca 100644
30--- a/libmultipath/Makefile 32--- a/libmultipath/Makefile
31+++ b/libmultipath/Makefile 33+++ b/libmultipath/Makefile
32@@ -20,21 +20,10 @@ ifdef SYSTEMD 34@@ -22,33 +22,13 @@ ifdef SYSTEMD
33 endif 35 endif
34 endif 36 endif
35 37
36-ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) 38-ifneq ($(call check_func,dm_task_no_flush,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
37- CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE 39- CPPFLAGS += -DLIBDM_API_FLUSH
38-endif 40-endif
39- 41-
40-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) 42-ifneq ($(call check_func,dm_task_get_errno,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
41- CFLAGS += -DLIBDM_API_COOKIE 43- CPPFLAGS += -DLIBDM_API_GET_ERRNO
42-endif 44-endif
43- 45-
44-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) 46-ifneq ($(call check_func,dm_task_set_cookie,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
45- CFLAGS += -DLIBUDEV_API_RECVBUF 47- CPPFLAGS += -DLIBDM_API_COOKIE
46-endif 48-endif
47- 49-
48-ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) 50-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(LIBUDEV_INCDIR)/libudev.h),0)
49- CFLAGS += -DLIBDM_API_DEFERRED 51- CPPFLAGS += -DLIBUDEV_API_RECVBUF
50-endif 52-endif
51+CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE 53-
52+CFLAGS += -DLIBDM_API_COOKIE 54-ifneq ($(call check_func,dm_task_deferred_remove,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
53+CFLAGS += -DLIBUDEV_API_RECVBUF 55- CPPFLAGS += -DLIBDM_API_DEFERRED
54+CFLAGS += -DLIBDM_API_DEFERRED 56-endif
57-
58-ifneq ($(call check_func,dm_hold_control_dev,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
59- CPPFLAGS += -DLIBDM_API_HOLD_CONTROL
60-endif
61-
62-ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(LINUX_HEADERS_INCDIR)/scsi/fc/fc_els.h),0)
63- CPPFLAGS += -DFPIN_EVENT_HANDLER
64-endif
65+CPPFLAGS += -DLIBDM_API_FLUSH
66+CPPFLAGS += -DLIBDM_API_GET_ERRNO
67+CPPFLAGS += -DLIBDM_API_COOKIE
68+CPPFLAGS += -DLIBUDEV_API_RECVBUF
69+CPPFLAGS += -DLIBDM_API_DEFERRED
70+CPPFLAGS += -DLIBDM_API_HOLD_CONTROL
71+CPPFLAGS += -DFPIN_EVENT_HANDLER
55 72
56 OBJS = memory.o parser.o vector.o devmapper.o callout.o \ 73 # object files referencing MULTIPATH_DIR or CONFIG_DIR
57 hwtable.o blacklist.o util.o dmparser.o config.o \ 74 # they need to be recompiled for unit tests
58-- 75--
592.7.4 762.38.1
60 77
diff --git a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch b/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch
index 418c0200f4..2d043c3991 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch
@@ -1,4 +1,4 @@
1From 1fe937835311a2d0afbc85ce4a4dbd3c9e0c912f Mon Sep 17 00:00:00 2001 1From 820d2ef3596189041da43d1139da8689336bb918 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 11:19:45 +0800 3Date: Mon, 26 Nov 2018 11:19:45 +0800
4Subject: [PATCH] Subject: [PATCH] Always use devmapper for kpartx 4Subject: [PATCH] Subject: [PATCH] Always use devmapper for kpartx
@@ -19,25 +19,27 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
19 19
20Rebase to 0.7.9 20Rebase to 0.7.9
21Signed-off-by: Changqing Li <changqing.li@windriver.com> 21Signed-off-by: Changqing Li <changqing.li@windriver.com>
22[OP: Rebase to 0.9.3]
23Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
22--- 24---
23 kpartx/Makefile | 4 +--- 25 kpartx/Makefile | 4 +---
24 1 file changed, 1 insertion(+), 3 deletions(-) 26 1 file changed, 1 insertion(+), 3 deletions(-)
25 27
26diff --git a/kpartx/Makefile b/kpartx/Makefile 28diff --git a/kpartx/Makefile b/kpartx/Makefile
27index 7eb467e..c143321 100644 29index 742d3bcd..d886483d 100644
28--- a/kpartx/Makefile 30--- a/kpartx/Makefile
29+++ b/kpartx/Makefile 31+++ b/kpartx/Makefile
30@@ -8,9 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) 32@@ -9,9 +9,7 @@ LDFLAGS += $(BIN_LDFLAGS)
31 33
32 LIBDEPS += -ldevmapper 34 LIBDEPS += -ldevmapper
33 35
34-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) 36-ifneq ($(call check_func,dm_task_set_cookie,$(DEVMAPPER_INCDIR)/libdevmapper.h),0)
35- CFLAGS += -DLIBDM_API_COOKIE 37- CPPFLAGS += -DLIBDM_API_COOKIE
36-endif 38-endif
37+CFLAGS += -DLIBDM_API_COOKIE 39+CPPFLAGS += -DLIBDM_API_COOKIE
38 40
39 OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ 41 OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
40 gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o 42 gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
41-- 43--
422.7.4 442.38.1
43 45
diff --git a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch
index b35d67cf59..407dff507a 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch
@@ -1,4 +1,4 @@
1From 35421d03898ac1b38f97a76241e6a29086d0c9f1 Mon Sep 17 00:00:00 2001 1From 21a8680b7bd436867ac689a0b4b1b18a3359e208 Mon Sep 17 00:00:00 2001
2From: Geoff Parker <geoffrey.parker@arthrex.com> 2From: Geoff Parker <geoffrey.parker@arthrex.com>
3Date: Fri, 9 Oct 2020 17:48:47 +0000 3Date: Fri, 9 Oct 2020 17:48:47 +0000
4Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to 4Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to
@@ -12,15 +12,17 @@ ownership or permissions settings on the files. 'sed -i' is compatible
12with pseudo. 12with pseudo.
13 13
14Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com> 14Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
15[OP: Rebase to 0.9.3]
16Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
15--- 17---
16 libdmmp/Makefile | 6 +++--- 18 libdmmp/Makefile | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-) 19 1 file changed, 3 insertions(+), 3 deletions(-)
18 20
19diff --git a/libdmmp/Makefile b/libdmmp/Makefile 21diff --git a/libdmmp/Makefile b/libdmmp/Makefile
20index 1dd3f340..8166075c 100644 22index e4589250..34e06425 100644
21--- a/libdmmp/Makefile 23--- a/libdmmp/Makefile
22+++ b/libdmmp/Makefile 24+++ b/libdmmp/Makefile
23@@ -34,11 +34,11 @@ install: 25@@ -39,11 +39,11 @@ install:
24 $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB) 26 $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB)
25 $(INSTALL_PROGRAM) -m 644 -D \ 27 $(INSTALL_PROGRAM) -m 644 -D \
26 $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE) 28 $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
@@ -33,8 +35,8 @@ index 1dd3f340..8166075c 100644
33- perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ 35- perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
34+ sed -i 's|__INCLUDEDIR__|$(includedir)|g' \ 36+ sed -i 's|__INCLUDEDIR__|$(includedir)|g' \
35 $(DESTDIR)$(pkgconfdir)/$(PKGFILE) 37 $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
36 @for file in docs/man/*.3.gz; do \ 38 $(INSTALL_PROGRAM) -d 755 $(DESTDIR)$(man3dir)
37 $(INSTALL_PROGRAM) -m 644 -D \ 39 $(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3
38-- 40--
392.20.1 412.38.1
40 42
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb
index 5a8db08771..ae4b3b9bf6 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb
@@ -46,13 +46,11 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=mas
46 file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \ 46 file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \
47 file://0001-fix-bug-of-do_compile-and-do_install.patch \ 47 file://0001-fix-bug-of-do_compile-and-do_install.patch \
48 file://0001-add-explicit-dependency-on-libraries.patch \ 48 file://0001-add-explicit-dependency-on-libraries.patch \
49 file://0001-fix-boolean-value-with-json-c-0.14.patch \
50 file://0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch \
51 " 49 "
52 50
53LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 51LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
54 52
55SRCREV = "d4915917655b3d205aa0e339ca13080ed8182d0d" 53SRCREV = "1332947447133fdf26246012b836868a3d974f0e"
56 54
57S = "${WORKDIR}/git" 55S = "${WORKDIR}/git"
58 56
@@ -75,10 +73,15 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
75# 73#
76EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ 74EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
77 OPTFLAGS="${CFLAGS}" \ 75 OPTFLAGS="${CFLAGS}" \
76 prefix=${prefix} \
78 bindir=${base_sbindir} \ 77 bindir=${base_sbindir} \
79 LIB=${base_libdir} libdir=${base_libdir}/multipath \ 78 LIB=${base_libdir} libdir=${base_libdir}/multipath \
79 usrlibdir=${libdir} \
80 plugindir=${base_libdir}/multipath \
80 unitdir=${systemd_system_unitdir} \ 81 unitdir=${systemd_system_unitdir} \
81 libudevdir=${nonarch_base_libdir}/udev \ 82 libudevdir=${nonarch_base_libdir}/udev \
83 modulesloaddir=${sysconfdir}/modules-load.d \
84 tmpfilesdir=${sysconfdir}/tmpfiles.d \
82 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ 85 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \
83 ' 86 '
84 87
@@ -105,7 +108,7 @@ FILES:${PN}-dbg += "${base_libdir}/multipath/.debug"
105PACKAGES =+ "${PN}-libs" 108PACKAGES =+ "${PN}-libs"
106FILES:${PN}-libs = "${base_libdir}/lib*.so.* \ 109FILES:${PN}-libs = "${base_libdir}/lib*.so.* \
107 ${base_libdir}/multipath/lib*.so*" 110 ${base_libdir}/multipath/lib*.so*"
108RDEPENDS:${PN} += "${PN}-libs bash" 111RDEPENDS:${PN} += "${PN}-libs bash libgcc"
109 112
110PROVIDES += "device-mapper-multipath" 113PROVIDES += "device-mapper-multipath"
111RPROVIDES:${PN} += "device-mapper-multipath" 114RPROVIDES:${PN} += "device-mapper-multipath"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-19 22:18:38 +0000