mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
multipath-tools: upgrade 0.11.1 -> 0.11.3
Dropped 0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch and 0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch which are now merged in the upstream. Refreshed other patches for the new version. Release Note: https://github.com/opensvc/multipath-tools/blob/0.11.3/NEWS.md Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ankur Tyagi
Khem Raj
parent
e09a58d3d2
commit
c5560026f6
|
|
@ -1,4 +1,4 @@
|
|||
From 68160e86472b197107c60bf6e5a3d126040e85b6 Mon Sep 17 00:00:00 2001
|
||||
From 9fb89db1bb09efc5b31a140c26d540072083c5e5 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Marzinski <bmarzins@redhat.com>
|
||||
Date: Thu, 13 Apr 2017 07:22:23 -0500
|
||||
Subject: [PATCH] RH: fixup udev rules for redhat
|
||||
|
|
@ -28,7 +28,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.inc b/Makefile.inc
|
||||
index 729618bd..69521882 100644
|
||||
index 65f6efc8..596e68c0 100644
|
||||
--- a/Makefile.inc
|
||||
+++ b/Makefile.inc
|
||||
@@ -62,7 +62,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d
|
||||
|
|
@ -74,6 +74,3 @@ index 67fb5e62..2ea9e528 100644
|
|||
$(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8
|
||||
$(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5
|
||||
$(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 1d444772db14f4acb8d47b874462b0cc171ab672 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 17 Feb 2025 12:01:59 -0800
|
||||
Subject: [PATCH] libmpathutils/uxsock.c: Include string.h for memcpy
|
||||
|
||||
Fixes
|
||||
uxsock.c:72:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
|
||||
Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250217200503.4166910-1-raj.khem@gmail.com/T/#u]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Cc: Benjamin Marzinski <bmarzins@redhat.com>
|
||||
Cc: Martin Wilck <mwilck@suse.com>
|
||||
---
|
||||
libmpathutil/uxsock.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libmpathutil/uxsock.c b/libmpathutil/uxsock.c
|
||||
index 2135476d..a474874e 100644
|
||||
--- a/libmpathutil/uxsock.c
|
||||
+++ b/libmpathutil/uxsock.c
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
+#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From e3449e163d7fe9bf1e188f0e28962f0659e9652d Mon Sep 17 00:00:00 2001
|
||||
From 14716a10c22206722ee48b44b88f0eec5203f228 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Fri, 1 Mar 2024 10:34:06 +0800
|
||||
Subject: [PATCH] RH: Remove the property blacklist exception builtin
|
||||
|
|
@ -58,6 +58,3 @@ index 17e1b54a..2cfb18b8 100644
|
|||
}
|
||||
|
||||
static void free_ble(struct blentry *ble)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 2fe1037b8198bd00961d8df48e684296758127d1 Mon Sep 17 00:00:00 2001
|
||||
From 2cb4657779cbb6ba2309f158366df4cb32f32785 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Fri, 23 Nov 2018 17:25:15 +0800
|
||||
Subject: [PATCH] RH: don't start without a config file
|
||||
|
|
@ -101,11 +101,11 @@ index 7bc8806e..315884eb 100644
|
|||
.
|
||||
.\" ----------------------------------------------------------------------------
|
||||
diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
|
||||
index b6a25b31..f78bb91b 100644
|
||||
index eb58943c..553e27f9 100644
|
||||
--- a/multipathd/multipathd.service.in
|
||||
+++ b/multipathd/multipathd.service.in
|
||||
@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
|
||||
Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@
|
||||
Wants=systemd-udevd-kernel.socket multipathd-queueing.service @MODPROBE_UNIT@
|
||||
After=systemd-udevd-kernel.socket @MODPROBE_UNIT@
|
||||
After=multipathd.socket systemd-remount-fs.service
|
||||
+ConditionPathExists=/etc/multipath.conf
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From dd4f005ab3b38cee2776dcb0a0661c5a01befd00 Mon Sep 17 00:00:00 2001
|
||||
From c34eca043178e60ff04dc88953a71b36ce9dc1b0 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] RH: use rpm optflags if present
|
||||
|
|
@ -24,7 +24,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.inc b/Makefile.inc
|
||||
index 69521882..2127f208 100644
|
||||
index 596e68c0..42766867 100644
|
||||
--- a/Makefile.inc
|
||||
+++ b/Makefile.inc
|
||||
@@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
|
||||
|
|
@ -48,11 +48,8 @@ index 69521882..2127f208 100644
|
|||
-DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
|
||||
-DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \
|
||||
-DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
|
||||
-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
|
||||
+CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe \
|
||||
-CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
|
||||
+CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \
|
||||
-fexceptions
|
||||
BIN_CFLAGS := -fPIE -DPIE
|
||||
LIB_CFLAGS := -fPIC
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 4035b48b512b5010b1c33aeba8c58cf2705bca83 Mon Sep 17 00:00:00 2001
|
||||
From 4ce6abf6f30fc6cadc9c9fc50b66363078a0162e Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Mon, 26 Nov 2018 09:55:12 +0800
|
||||
Subject: [PATCH] RH: add mpathconf
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From bd65cdc704666dd4153779c74cdbb2cac6efea71 Mon Sep 17 00:00:00 2001
|
||||
From 95f4611621ed7cc5144c68c51adc58409210ad1d 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] RH: add wwids from kernel cmdline mpath.wwids with -A
|
||||
|
|
@ -90,6 +90,3 @@ index ee47ad9f..1ed0d85e 100644
|
|||
|
||||
enum {
|
||||
WWID_IS_NOT_FAILED = 0,
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001
|
||||
From 74051f361ce0b9b4405afc789c62a277aa37cc05 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Fri, 1 Mar 2024 11:45:10 +0800
|
||||
Subject: [PATCH] RH: warn on invalid regex instead of failing
|
||||
|
|
@ -100,6 +100,3 @@ index a06a6138..a734ba9b 100644
|
|||
declare_hw_snprint(bl_product, print_str)
|
||||
|
||||
declare_hw_arg_str_handler(hwhandler, 0)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 87e19d273c46fe78933627fc4e8046e3a76da47a Mon Sep 17 00:00:00 2001
|
||||
From 261ef06a4fb24f533c240a0a747a165eec0ee0dd Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Mon, 26 Nov 2018 11:12:01 +0800
|
||||
Subject: [PATCH] RH: reset default find_mutipaths value to off
|
||||
|
|
@ -29,6 +29,3 @@ index 02f7e57c..98dd66f7 100644
|
|||
#define DEFAULT_FAST_IO_FAIL 5
|
||||
#define DEFAULT_DEV_LOSS_TMO 600
|
||||
#define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c22c897e7c55fc0b8c5bdd113a0357654ee895ae Mon Sep 17 00:00:00 2001
|
||||
From 3491d5ed1633a42d1f46d50ebce324d28e02ed32 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 4 Jun 2019 11:39:39 +0800
|
||||
Subject: [PATCH] multipath-tools: modify create-config.mk for
|
||||
|
|
@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/create-config.mk b/create-config.mk
|
||||
index 8bd2c20c..40d2446a 100644
|
||||
index e8fa391c..f620da5a 100644
|
||||
--- a/create-config.mk
|
||||
+++ b/create-config.mk
|
||||
@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0)
|
||||
|
|
@ -35,6 +35,3 @@ index 8bd2c20c..40d2446a 100644
|
|||
# $(call TEST_CC_OPTION,option,fallback)
|
||||
# Test if the C compiler supports the option.
|
||||
# Evaluates to "option" if yes, and "fallback" otherwise.
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c34c65a3f5ddec22cb417872f90c2c9540a1847b Mon Sep 17 00:00:00 2001
|
||||
From 4d68ea4a75c63cf92469be95579542c434561871 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Mon, 26 Nov 2018 11:17:41 +0800
|
||||
Subject: [PATCH] Always use devmapper
|
||||
|
|
@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|||
1 file changed, 8 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/create-config.mk b/create-config.mk
|
||||
index 40d2446a..f5eb2803 100644
|
||||
index f620da5a..8ffcde02 100644
|
||||
--- a/create-config.mk
|
||||
+++ b/create-config.mk
|
||||
@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \
|
||||
|
|
@ -67,6 +67,3 @@ index 40d2446a..f5eb2803 100644
|
|||
|
||||
libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h
|
||||
ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 698361847e6fae321bc277a5fc518b2bd55751b8 Mon Sep 17 00:00:00 2001
|
||||
From 85c4bdd939b7f77a773d24fcc5330fc35542d7d3 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
|
||||
|
|
@ -38,6 +38,3 @@ index f06f7faa..690dc050 100644
|
|||
libmultipath/checkers.install \
|
||||
libmultipath/prioritizers.install \
|
||||
libmultipath/foreign.install: libmultipath.install
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 69ee17207574ca032c3cb46a3db99736de3eedf8 Mon Sep 17 00:00:00 2001
|
||||
From edb01d9a3c29d31493a0435ab35e9d438f391267 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Mon, 25 May 2020 23:22:55 -0700
|
||||
Subject: [PATCH] add explicit dependency on libraries
|
||||
|
|
@ -35,6 +35,3 @@ index 690dc050..b775f949 100644
|
|||
|
||||
DEPS_ON_MULTIPATH := \
|
||||
multipath \
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 6e231d887c20b2139db75e6dc6c20107273aaacd Mon Sep 17 00:00:00 2001
|
||||
From 83734bbf19bb9e256da6f92a3bda26aa0f63245d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
|
||||
Date: Thu, 3 Apr 2025 10:25:30 +0200
|
||||
Subject: [PATCH] libdmmp/Makefile: Add target docs/man/dmmp_strerror.3 to
|
||||
|
|
@ -12,7 +12,7 @@ Sometimes, the timestamps are updated in the man pages, sometimes not.
|
|||
Upstream-Status: Denied
|
||||
|
||||
https://lore.kernel.org/dm-devel/72355f1d0984647e91f8c50f1c2295071af49e33.camel@suse.com/
|
||||
The patch has been rejected by upstream, who will update the timestamps of the
|
||||
The patch has been rejected by upstream, who will update the timestamps of the
|
||||
manpages with a new commit.
|
||||
In order to be reproducible without having a random result, forcing the target
|
||||
rebuild by adding it to .PHONY is the more acceptable solution, the alternative
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From bcb052a8dadbd0a837986b1e15924b469fc59edc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
|
||||
Date: Thu, 3 Apr 2025 10:08:49 +0200
|
||||
Subject: [PATCH] libdmmp/Makefile: Fix KBUILD_BUILD_TIMESTAMP usage
|
||||
|
||||
Add missing $ (Makefile need to escape '$' as '$$')
|
||||
|
||||
Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250404122902.2750036-1-sofiane.hamam@smile.fr/]
|
||||
|
||||
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
|
||||
Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
|
||||
Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
|
||||
---
|
||||
libdmmp/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdmmp/Makefile b/libdmmp/Makefile
|
||||
index 172ba045..7e0e2509 100644
|
||||
--- a/libdmmp/Makefile
|
||||
+++ b/libdmmp/Makefile
|
||||
@@ -74,7 +74,7 @@ doc: docs/man/dmmp_strerror.3
|
||||
docs/man/dmmp_strerror.3: $(HEADERS)
|
||||
$(Q)TEMPFILE=$(shell mktemp); \
|
||||
cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
|
||||
- [ "$KBUILD_BUILD_TIMESTAMP" ] || \
|
||||
+ [ "$$KBUILD_BUILD_TIMESTAMP" ] || \
|
||||
KBUILD_BUILD_TIMESTAMP=`git log -n1 --pretty=%cd --date=iso -- $^`; \
|
||||
export KBUILD_BUILD_TIMESTAMP; \
|
||||
LC_ALL=C \
|
||||
|
|
@ -44,14 +44,12 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=st
|
|||
file://0010-Always-use-devmapper.patch \
|
||||
file://0011-fix-bug-of-do_compile-and-do_install.patch \
|
||||
file://0012-add-explicit-dependency-on-libraries.patch \
|
||||
file://0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch \
|
||||
file://0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch \
|
||||
file://0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \
|
||||
file://0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \
|
||||
"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
|
||||
|
||||
SRCREV = "cb8de98b2cc3b62fd1a578ba479c0820778e9c02"
|
||||
SRCREV = "7a84cc602ea0884ae0c767e6c89592059012db04"
|
||||
|
||||
|
||||
inherit systemd pkgconfig
|
||||
Loading…
Reference in New Issue
Block a user