summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/multipath-tools
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-15 22:09:53 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-21 23:43:47 +0300
commit7f40b7168b897da48694d6e71fd3fd45861bfb19 (patch)
treefc7d9f02c5a2e0322b6aaac5cac6d12959fd26bb /meta-openembedded/meta-oe/recipes-support/multipath-tools
parentdce5cf9dceda684d40fb0e9686ba884ed6b0751f (diff)
downloadopenbmc-7f40b7168b897da48694d6e71fd3fd45861bfb19.tar.xz
meta-openembedded: subtree update:679bb49126..7c02c7d411
Adam Miartus (1): toybox: allow user to provide own defconfig Adrian Bunk (5): uftrace: Fix PR mraa: Replace -fcommon with fix mozjs: Remove workaround for gcc < 4.9 flatbuffers: Remove workarounds for gcc < 6 protobuf-c: Remove workarounds for gcc < 6 Alejandro Enedino Hernandez Samaniego (2): weechat: introduce weechat recipe providing a fully working IRC client imapfilter: introduce imapfilter recipe providing a mailbox filter through the IMAP protocol Alejandro Hernandez Samaniego (1): remmina: Upgrade to version 1.4.3 Alexander Vickberg (2): tcpdump: Fix PACKAGECONFIG for OpenSSL iperf3: Add OpenSSL build option to PACKAGECONFIG Alistair Francis (2): geany-plugins: Support libgit2 version 1.0 libgit2: Update to v1.0.0 Andreas Müller (5): xfce4-notifyd: upgrade 0.6.0 -> 0.6.1 xfconf: upgrade 4.14.1 -> 4.14.2 xfwm4: upgrade 4.14.1 -> 4.14.2 qpdf: upgrade 9.1.0 -> 10.0.1 qpdf: link libatomic explicitly on mips Bartłomiej Burdukiewicz (2): pugixml: generate pkgconfig files. pugixml: add native and nativesdk BBCLASSEXTEND Claude Bing (3): php: fix PACKAGECONFIG for soap php: fix opcache link error in 7.4 php: update fix for opcache link issue in 7.4.4 Emmanuel Roullit (1): cockpit: fix metainfo.xml file ownership Gianfranco Costamagna (1): cpprest: Disable one more test requiring internet connection Gregory Vimont (1): opencv: 4.1.0 -> 4.3.0 Jonathan Liu (1): x11vnc: fix xfc NULL pointer dereference Jorge Solla (1): Cockpit: Added missing dependency on udisks2 for package cockpit-storaged Khem Raj (7): remmina: Depend on avahi instead of Avahi-ui libgit2: Enable pcre2 regexp backend con2fbmap: Add recipe xf86-input-void: Drop INC_PR nodejs: Fix build with icu 67.1 nss: Remove mcpu to avoid march conflicts pmdk: Update to 1.8 Konrad Weihmann (2): php: fix zip package config php: add multibyte string support config Leon Anavi (1): lirc: upgrade 0.9.4d -> 0.10.1 Michael Haener (1): cockpit: Add recipe version 218 Mingli Yu (10): python3-ntplib: add missing python3-io RDEPENDS python3-pid: add the missing rdepends python3-parallax: add the missing rdepends python3-pkgconfig: add missing rdepends python3-pathlib2: add the missing rdepends python3-ptyprocess: add the missing rdepends python3-pydbus: add the missing rdepends python3-pyudev: add the missing rdepends python3-zipp: add the missing rdepends gnome-themes-extra: correct the recipe name Pierre-Jean Texier (1): ccid: upgrade 1.4.31 -> 1.4.32 Rasmus Villemoes (1): libgpiod: split c++ library to its own package Sean Nyekjaer (1): gpsd: Upgrade 3.19 -> 3.20 Slater, Joseph (2): python-pretty-table: add rdep's python3-pyhamcrest: add rdep Trevor Gamblin (7): python3-py: add python3-netclient to RDEPENDS python3-markdown: add logging and setuptools to RDEPENDS python3-pyrsistent: add python3-numbers to RDEPENDS python3-pytoml: add datetime and stringold to RDEPENDS python3-dbusmock: re-add recipe and fix patch path python3-pyyaml: add python3-netclient to RDEPENDS python3-werkzeug: add python3-logging to RDEPENDS Wang Mingyu (6): mailcap: upgrade 2.1.48 -> 2.1.49 sanlock: upgrade 3.8.0 -> 3.8.1 libcgi-perl: upgrade 4.46 -> 4.47 libencode-perl: upgrade 3.05 -> 3.06 python3-idna: upgrade 2.8 -> 2.9 multipath-tools: upgrade 0.8.3 -> 0.8.4 Yi Zhao (1): nginx: remove /var/log/nginx when do_install Zang Ruochen (8): python3-parse-type: Modify ptest output format python3-pluggy: Modify ptest output format python3-polyline: Modify ptest output format python3-precise-runner: Modify ptest output format python3-prettytable: Modify ptest output format python3-ptyprocess: Modify ptest output format python3-pyasn1: Modify ptest output format python3-pyasn1-modules: Modify ptest output format Zheng Ruoqin (4): python3-pyserial: Modify ptest output format python3-pyroute2: Modify ptest output format v4l-utils: upgrade 1.18.0 -> 1.18.1 cpprest: upgrade 2.10.15 -> 2.10.16 Zong Li (1): Upgrade testfloat to 3e version. niko.mauno@vaisala.com (3): python3-setuptools-scm: Cosmetic improvement python3-setuptools-scm: Add nativesdk to BBCLASSEXTEND python3-attrs: Add nativesdk to BBCLASSEXTEND Change-Id: I696f29557eafda5f9f9d6e26525e1a5819982a4b Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/multipath-tools')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch44
-rw-r--r--meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch33
-rw-r--r--meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch93
-rw-r--r--meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb (renamed from meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb)3
4 files changed, 77 insertions, 96 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch
@@ -0,0 +1,44 @@
+From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@cn.fujitsu.com>
+Date: Sun, 10 May 2020 21:22:53 +0800
+Subject: [PATCH] fix bug of do_compile and do_install
+
+when multiple processes make run in parallel,
+because of dependency error will occur.
+
+Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
+---
+ Makefile | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1dee3680..bea0a0b2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,9 +28,22 @@ all: $(BUILDDIRS)
+ $(BUILDDIRS):
+ $(MAKE) -C $@
+
+-multipath multipathd mpathpersist: libmultipath
++multipath multipathd mpathpersist libmpathpersist : libmultipath
+ mpathpersist: libmpathpersist
+
++DEPS_ON_MULTIPATH := \
++ multipath \
++ libmultipath/prioritizers \
++ libmultipath/checkers \
++ libmultipath/foreign \
++ multipathd \
++ mpathpersist \
++ libmpathpersist
++
++$(DEPS_ON_MULTIPATH:=.install): libmultipath.install
++mpathpersist.install: libmpathpersist.install
++libdmmp.install libmultipath/foreign.install: mpathpersist.install
++
+ $(BUILDDIRS.clean):
+ $(MAKE) -C ${@:.clean=} clean
+
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch
index 77dd96fee6..17542fd4fd 100644
--- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch
+++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch
@@ -1,9 +1,12 @@
From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 26 Nov 2018 09:19:17 +0800
-Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17
- 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 19
- Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if present
+Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep
+17
+ 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed,
+19
+ Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if
+present
Use the passed in optflags when compiling as an RPM, and keep the
default flags as close as possible to the current fedora flags, while
@@ -17,26 +20,20 @@ update this patch to new version
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
- Makefile.inc | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
+ Makefile.inc | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
-index b86cba6..295afb9 100644
+index 42dbb5bf..55a06c60 100644
--- a/Makefile.inc
+++ b/Makefile.inc
-@@ -85,15 +85,22 @@ TEST_CC_OPTION = $(shell \
+@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \
echo "$(2)"; \
fi)
-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
-ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
--
--OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \
-- -Werror=implicit-function-declaration -Werror=format-security \
-- -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \
-- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
-- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
-- --param=ssp-buffer-size=4
+-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,)
+ifndef RPM_OPT_FLAGS
+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \
@@ -54,8 +51,14 @@ index b86cba6..295afb9 100644
+ -Wno-unused-parameter -Werror=cast-qual \
+ -Werror=discarded-qualifiers
+-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \
+- -Werror=implicit-function-declaration -Werror=format-security \
+- $(WNOCLOBBERED) \
+- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
+- $(STACKPROT) --param=ssp-buffer-size=4
+ CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2
CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
-MMD -MP $(CFLAGS)
--
-2.7.4
+2.17.1
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,9 +1,12 @@
From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 26 Sep 2019 16:29:48 +0800
-Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17
- 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17
- Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline
+Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep
+17
+ 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri,
+17
+ Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel
+cmdline
mpath.wwids with -A
This patch adds another option to multipath, "-A", which reads
@@ -23,18 +26,15 @@ Update this patch to new version 0.8.2
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
- libmultipath/wwids.c | 44 +++++++++++++++++++++++++++++++++++++++++++
- libmultipath/wwids.h | 1 +
- multipath/main.c | 9 ++++++++-
- multipath/multipath.8 | 3 +++
- multipathd/multipathd.service | 1 +
- 5 files changed, 57 insertions(+), 1 deletion(-)
+ libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ libmultipath/wwids.h | 1 +
+ 2 files changed, 45 insertions(+)
diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
-index ef74812..19c4d68 100644
+index 28a2150d..a0bfa851 100644
--- a/libmultipath/wwids.c
+++ b/libmultipath/wwids.c
-@@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \
+@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \
declare_failed_wwid_op(is_failed, false)
declare_failed_wwid_op(mark_failed, true)
declare_failed_wwid_op(unmark_failed, true)
@@ -83,7 +83,7 @@ index ef74812..19c4d68 100644
+ return ret;
+}
diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
-index 0c6ee54..e32a0b0 100644
+index 0c6ee54d..e32a0b0e 100644
--- a/libmultipath/wwids.h
+++ b/libmultipath/wwids.h
@@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
@@ -94,73 +94,6 @@ index 0c6ee54..e32a0b0 100644
enum {
WWID_IS_NOT_FAILED = 0,
-diff --git a/multipath/main.c b/multipath/main.c
-index 96a1146..5fc65ef 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -139,6 +139,7 @@ usage (char * progname)
- fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname);
- fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname);
- fprintf (stderr, " %s [-v level] -W\n", progname);
-+ fprintf (stderr, " %s [-v level] -A\n", progname);
- fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname);
- fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname);
- fprintf (stderr, " %s [-h|-t|-T]\n", progname);
-@@ -151,6 +152,8 @@ usage (char * progname)
- " -f flush a multipath device map\n"
- " -F flush all multipath device maps\n"
- " -a add a device wwid to the wwids file\n"
-+ " -A add devices from kernel command line mpath.wwids\n"
-+ " parameters to wwids file\n"
- " -c check if a device should be a path in a multipath device\n"
- " -C check if a multipath device has usable paths\n"
- " -q allow queue_if_no_path when multipathd is not running\n"
-@@ -905,7 +908,7 @@ main (int argc, char *argv[])
- exit(RTVL_FAIL);
- multipath_conf = conf;
- conf->retrigger_tries = 0;
-- while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
-+ while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
- switch(arg) {
- case 1: printf("optarg : %s\n",optarg);
- break;
-@@ -998,6 +1001,10 @@ main (int argc, char *argv[])
- case 'R':
- retries = atoi(optarg);
- break;
-+ case 'A':
-+ if (remember_cmdline_wwid() != 0)
-+ exit(1);
-+ exit(0);
- case ':':
- fprintf(stderr, "Missing option argument\n");
- usage(argv[0]);
-diff --git a/multipath/multipath.8 b/multipath/multipath.8
-index 9cdd05a..1e120f3 100644
---- a/multipath/multipath.8
-+++ b/multipath/multipath.8
-@@ -167,6 +167,9 @@ itself doesn't attempt to do I/O on the device.
- Check if the device specified in the program environment should be
- a path in a multipath device.
- .
-+.B \-A
-+add wwids from any kernel command line mpath.wwid parameters to the wwids file
-+.
- .TP
- .B \-U
- Check if the device specified in the program environment is a multipath device
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index 17434ce..0fbcc46 100644
---- a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -15,6 +15,7 @@ Type=notify
- NotifyAccess=main
- LimitCORE=infinity
- ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
-+ExecStartPre=-/sbin/multipath -A
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- TasksMax=infinity
--
-2.7.4
+2.17.1
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index 9e2d86b9a6..2795a8d091 100644
--- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb
+++ b/meta-openembedded/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 \
file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \
file://0030-Always-use-devmapper.patch \
file://0031-Always-use-devmapper-for-kpartx.patch \
+ file://0001-fix-bug-of-do_compile-and-do_install.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-SRCREV = "6c3bd369b23e959700527e0e2e6d5b2a1bd36294"
+SRCREV = "d4915917655b3d205aa0e339ca13080ed8182d0d"
S = "${WORKDIR}/git"