summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch44
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch33
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch93
-rw-r--r--meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb (renamed from meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb)3
4 files changed, 77 insertions, 96 deletions
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
new file mode 100644
index 0000000000..ac87337694
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch
@@ -0,0 +1,44 @@
1From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@cn.fujitsu.com>
3Date: Sun, 10 May 2020 21:22:53 +0800
4Subject: [PATCH] fix bug of do_compile and do_install
5
6when multiple processes make run in parallel,
7because of dependency error will occur.
8
9Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
10---
11 Makefile | 15 ++++++++++++++-
12 1 file changed, 14 insertions(+), 1 deletion(-)
13
14diff --git a/Makefile b/Makefile
15index 1dee3680..bea0a0b2 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -28,9 +28,22 @@ all: $(BUILDDIRS)
19 $(BUILDDIRS):
20 $(MAKE) -C $@
21
22-multipath multipathd mpathpersist: libmultipath
23+multipath multipathd mpathpersist libmpathpersist : libmultipath
24 mpathpersist: libmpathpersist
25
26+DEPS_ON_MULTIPATH := \
27+ multipath \
28+ libmultipath/prioritizers \
29+ libmultipath/checkers \
30+ libmultipath/foreign \
31+ multipathd \
32+ mpathpersist \
33+ libmpathpersist
34+
35+$(DEPS_ON_MULTIPATH:=.install): libmultipath.install
36+mpathpersist.install: libmpathpersist.install
37+libdmmp.install libmultipath/foreign.install: mpathpersist.install
38+
39 $(BUILDDIRS.clean):
40 $(MAKE) -C ${@:.clean=} clean
41
42--
432.17.1
44
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 77dd96fee6..17542fd4fd 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,9 +1,12 @@
1From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 1From 436f7594485e35523269e662c4b5dc3a2c10ff9b 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 17 4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep
5 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 19 517
6 Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if present 6 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed,
719
8 Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if
9present
7 10
8Use the passed in optflags when compiling as an RPM, and keep the 11Use the passed in optflags when compiling as an RPM, and keep the
9default flags as close as possible to the current fedora flags, while 12default flags as close as possible to the current fedora flags, while
@@ -17,26 +20,20 @@ update this patch to new version
17 20
18Signed-off-by: Changqing Li <changqing.li@windriver.com> 21Signed-off-by: Changqing Li <changqing.li@windriver.com>
19--- 22---
20 Makefile.inc | 25 ++++++++++++++++--------- 23 Makefile.inc | 24 ++++++++++++++++--------
21 1 file changed, 16 insertions(+), 9 deletions(-) 24 1 file changed, 16 insertions(+), 8 deletions(-)
22 25
23diff --git a/Makefile.inc b/Makefile.inc 26diff --git a/Makefile.inc b/Makefile.inc
24index b86cba6..295afb9 100644 27index 42dbb5bf..55a06c60 100644
25--- a/Makefile.inc 28--- a/Makefile.inc
26+++ b/Makefile.inc 29+++ b/Makefile.inc
27@@ -85,15 +85,22 @@ TEST_CC_OPTION = $(shell \ 30@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \
28 echo "$(2)"; \ 31 echo "$(2)"; \
29 fi) 32 fi)
30 33
31-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) 34-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
32-ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) 35-ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
33- 36-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,)
34-OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \
35- -Werror=implicit-function-declaration -Werror=format-security \
36- -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \
37- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
38- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
39- --param=ssp-buffer-size=4
40+ifndef RPM_OPT_FLAGS 37+ifndef RPM_OPT_FLAGS
41+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) 38+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
42+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ 39+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \
@@ -54,8 +51,14 @@ index b86cba6..295afb9 100644
54+ -Wno-unused-parameter -Werror=cast-qual \ 51+ -Wno-unused-parameter -Werror=cast-qual \
55+ -Werror=discarded-qualifiers 52+ -Werror=discarded-qualifiers
56 53
54-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \
55- -Werror=implicit-function-declaration -Werror=format-security \
56- $(WNOCLOBBERED) \
57- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
58- $(STACKPROT) --param=ssp-buffer-size=4
59 CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2
57 CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ 60 CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
58 -MMD -MP $(CFLAGS) 61 -MMD -MP $(CFLAGS)
59-- 62--
602.7.4 632.17.1
61 64
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 724bef813a..5fd6d668e2 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,9 +1,12 @@
1From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 1From 0f54b3120ca06ff3168cdbf901a27b68c4638398 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 17 4Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep
5 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17 517
6 Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline 6 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri,
717
8 Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel
9cmdline
7 mpath.wwids with -A 10 mpath.wwids with -A
8 11
9This patch adds another option to multipath, "-A", which reads 12This patch adds another option to multipath, "-A", which reads
@@ -23,18 +26,15 @@ Update this patch to new version 0.8.2
23 26
24Signed-off-by: Changqing Li <changqing.li@windriver.com> 27Signed-off-by: Changqing Li <changqing.li@windriver.com>
25--- 28---
26 libmultipath/wwids.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 29 libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
27 libmultipath/wwids.h | 1 + 30 libmultipath/wwids.h | 1 +
28 multipath/main.c | 9 ++++++++- 31 2 files changed, 45 insertions(+)
29 multipath/multipath.8 | 3 +++
30 multipathd/multipathd.service | 1 +
31 5 files changed, 57 insertions(+), 1 deletion(-)
32 32
33diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c 33diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
34index ef74812..19c4d68 100644 34index 28a2150d..a0bfa851 100644
35--- a/libmultipath/wwids.c 35--- a/libmultipath/wwids.c
36+++ b/libmultipath/wwids.c 36+++ b/libmultipath/wwids.c
37@@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \ 37@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \
38 declare_failed_wwid_op(is_failed, false) 38 declare_failed_wwid_op(is_failed, false)
39 declare_failed_wwid_op(mark_failed, true) 39 declare_failed_wwid_op(mark_failed, true)
40 declare_failed_wwid_op(unmark_failed, true) 40 declare_failed_wwid_op(unmark_failed, true)
@@ -83,7 +83,7 @@ index ef74812..19c4d68 100644
83+ return ret; 83+ return ret;
84+} 84+}
85diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h 85diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
86index 0c6ee54..e32a0b0 100644 86index 0c6ee54d..e32a0b0e 100644
87--- a/libmultipath/wwids.h 87--- a/libmultipath/wwids.h
88+++ b/libmultipath/wwids.h 88+++ b/libmultipath/wwids.h
89@@ -17,6 +17,7 @@ int remember_wwid(char *wwid); 89@@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
@@ -94,73 +94,6 @@ index 0c6ee54..e32a0b0 100644
94 94
95 enum { 95 enum {
96 WWID_IS_NOT_FAILED = 0, 96 WWID_IS_NOT_FAILED = 0,
97diff --git a/multipath/main.c b/multipath/main.c
98index 96a1146..5fc65ef 100644
99--- a/multipath/main.c
100+++ b/multipath/main.c
101@@ -139,6 +139,7 @@ usage (char * progname)
102 fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname);
103 fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname);
104 fprintf (stderr, " %s [-v level] -W\n", progname);
105+ fprintf (stderr, " %s [-v level] -A\n", progname);
106 fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname);
107 fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname);
108 fprintf (stderr, " %s [-h|-t|-T]\n", progname);
109@@ -151,6 +152,8 @@ usage (char * progname)
110 " -f flush a multipath device map\n"
111 " -F flush all multipath device maps\n"
112 " -a add a device wwid to the wwids file\n"
113+ " -A add devices from kernel command line mpath.wwids\n"
114+ " parameters to wwids file\n"
115 " -c check if a device should be a path in a multipath device\n"
116 " -C check if a multipath device has usable paths\n"
117 " -q allow queue_if_no_path when multipathd is not running\n"
118@@ -905,7 +908,7 @@ main (int argc, char *argv[])
119 exit(RTVL_FAIL);
120 multipath_conf = conf;
121 conf->retrigger_tries = 0;
122- while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
123+ while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
124 switch(arg) {
125 case 1: printf("optarg : %s\n",optarg);
126 break;
127@@ -998,6 +1001,10 @@ main (int argc, char *argv[])
128 case 'R':
129 retries = atoi(optarg);
130 break;
131+ case 'A':
132+ if (remember_cmdline_wwid() != 0)
133+ exit(1);
134+ exit(0);
135 case ':':
136 fprintf(stderr, "Missing option argument\n");
137 usage(argv[0]);
138diff --git a/multipath/multipath.8 b/multipath/multipath.8
139index 9cdd05a..1e120f3 100644
140--- a/multipath/multipath.8
141+++ b/multipath/multipath.8
142@@ -167,6 +167,9 @@ itself doesn't attempt to do I/O on the device.
143 Check if the device specified in the program environment should be
144 a path in a multipath device.
145 .
146+.B \-A
147+add wwids from any kernel command line mpath.wwid parameters to the wwids file
148+.
149 .TP
150 .B \-U
151 Check if the device specified in the program environment is a multipath device
152diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
153index 17434ce..0fbcc46 100644
154--- a/multipathd/multipathd.service
155+++ b/multipathd/multipathd.service
156@@ -15,6 +15,7 @@ Type=notify
157 NotifyAccess=main
158 LimitCORE=infinity
159 ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
160+ExecStartPre=-/sbin/multipath -A
161 ExecStart=/sbin/multipathd -d -s
162 ExecReload=/sbin/multipathd reconfigure
163 TasksMax=infinity
164-- 97--
1652.7.4 982.17.1
166 99
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index 9e2d86b9a6..2795a8d091 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -43,11 +43,12 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
43 file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ 43 file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \
44 file://0030-Always-use-devmapper.patch \ 44 file://0030-Always-use-devmapper.patch \
45 file://0031-Always-use-devmapper-for-kpartx.patch \ 45 file://0031-Always-use-devmapper-for-kpartx.patch \
46 file://0001-fix-bug-of-do_compile-and-do_install.patch \
46 " 47 "
47 48
48LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 49LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
49 50
50SRCREV = "6c3bd369b23e959700527e0e2e6d5b2a1bd36294" 51SRCREV = "d4915917655b3d205aa0e339ca13080ed8182d0d"
51 52
52S = "${WORKDIR}/git" 53S = "${WORKDIR}/git"
53 54
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-08 20:42:38 +0000