From f6df00e469bf4e282acfbc46fda3d1a87ec0f572 Mon Sep 17 00:00:00 2001 From: hongwei-qin Date: Thu, 28 Apr 2022 18:00:15 +0800 Subject: [PATCH] update to device-mapper-multipath-0.8.4-17.el8_5.1 Signed-off-by: hongwei-qin --- 0001-modify-OPTFLAGS-for-loongarch64.patch | 41 ------------------ ...t-add-missing-conditions-from-servic.patch | 43 +++++++++++++++++++ device-mapper-multipath.spec | 11 +++-- download | 0 4 files changed, 48 insertions(+), 47 deletions(-) delete mode 100644 0001-modify-OPTFLAGS-for-loongarch64.patch create mode 100644 0077-multipathd.socket-add-missing-conditions-from-servic.patch create mode 100644 download diff --git a/0001-modify-OPTFLAGS-for-loongarch64.patch b/0001-modify-OPTFLAGS-for-loongarch64.patch deleted file mode 100644 index 736d87e..0000000 --- a/0001-modify-OPTFLAGS-for-loongarch64.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5b0ad487a46a47784f1d830b4717dcf2aec1854d Mon Sep 17 00:00:00 2001 -From: zhangwenlong -Date: Thu, 23 Sep 2021 08:08:14 +0000 -Subject: [PATCH] modify OPTFLAGS for loongarch64 - ---- - Makefile.inc | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 220009e..1472e4f 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -106,11 +106,19 @@ ifndef RPM_OPT_FLAGS - else - OPTFLAGS = $(RPM_OPT_FLAGS) - endif --OPTFLAGS += -Werror -Wextra -Wstrict-prototypes -Wformat=2 \ -- -Werror=implicit-int -Werror=implicit-function-declaration \ -- $(WNOCLOBBERED) \ -- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -- --param=ssp-buffer-size=4 -+ifeq ($(shell uname -m),loongarch64) -+ OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 \ -+ -Werror=implicit-int -Werror=implicit-function-declaration \ -+ $(WNOCLOBBERED) \ -+ -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -+ --param=ssp-buffer-size=4 -+else -+ OPTFLAGS += -Werror -Wextra -Wstrict-prototypes -Wformat=2 \ -+ -Werror=implicit-int -Werror=implicit-function-declaration \ -+ $(WNOCLOBBERED) \ -+ -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -+ --param=ssp-buffer-size=4 -+endif - - CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ - -MMD -MP $(CFLAGS) --- -2.27.0 - diff --git a/0077-multipathd.socket-add-missing-conditions-from-servic.patch b/0077-multipathd.socket-add-missing-conditions-from-servic.patch new file mode 100644 index 0000000..3b1fb1c --- /dev/null +++ b/0077-multipathd.socket-add-missing-conditions-from-servic.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luca BRUNO +Date: Fri, 24 Sep 2021 09:34:01 +0000 +Subject: [PATCH] multipathd.socket: add missing conditions from service unit + +Upstream Status: https://github.com/openSUSE/multipath-tools.git +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2008101 +Conflicts: Match the conditions with RHEL-8 multipathd.service unit + +commit 345ccf564ce7d904641bd32baf4fc53c2283d95c +Author: Luca BRUNO +Date: Fri Sep 24 09:34:01 2021 +0000 + + multipathd.socket: add missing conditions from service unit + + This aligns 'multipathd' socket and service units, by adding the + start conditions that are set on the service but not on the socket. + It should help avoiding situations where the socket unit ends up + marked as failed after hitting its retry-limit. + + Fixes: https://github.com/opensvc/multipath-tools/issues/15 + Signed-off-by: Luca BRUNO + Reviewed-by: Martin Wilck + +Signed-off-by: Benjamin Marzinski +--- + multipathd/multipathd.socket | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket +index 0ed4a1f7..c62c0fc8 100644 +--- a/multipathd/multipathd.socket ++++ b/multipathd/multipathd.socket +@@ -1,6 +1,9 @@ + [Unit] + Description=multipathd control socket + DefaultDependencies=no ++ConditionPathExists=/etc/multipath.conf ++ConditionKernelCommandLine=!nompath ++ConditionKernelCommandLine=!multipath=off + Before=sockets.target + + [Socket] diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index c6c343c..f345ca6 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.1 Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.8.4 -Release: 17%{anolis_release}%{?dist} +Release: 17%{?dist}.1 License: GPLv2 Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -88,8 +87,7 @@ Patch00073: 0073-multipath.conf-fix-typo-in-checker_timeout-descripti.patch Patch00074: 0074-mpathpersist-fail-commands-when-no-usable-paths-exis.patch Patch00075: 0075-multipath-print-warning-if-multipathd-is-not-running.patch Patch00076: 0076-multipathd-don-t-access-path-if-it-was-deleted.patch - -Patch00100: 0001-modify-OPTFLAGS-for-loongarch64.patch +Patch00077: 0077-multipathd.socket-add-missing-conditions-from-servic.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -291,8 +289,9 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog -* Thu Sep 23 2021 zhangwenlong 0.8.4-17.0.1 -- Add loongarch64 support for device-mapper-multipath +* Thu Feb 17 2022 Benjamin Marzinski 0.8.4-17.1 +- Add 0077-multipathd.socket-add-missing-conditions-from-servic.patch +- Resolves: bz #2054877 * Fri Jul 23 2021 Benjamin Marzinski 0.8.4-17 - Add 0074-mpathpersist-fail-commands-when-no-usable-paths-exis.patch diff --git a/download b/download new file mode 100644 index 0000000..e69de29 -- Gitee