summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/multipath-tools
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/multipath-tools')
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch29
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch28
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch42
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch10
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch19
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch29
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch11
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch12
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch6
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch (renamed from meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch)6
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch29
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch41
-rw-r--r--[-rwxr-xr-x]meta-oe/recipes-support/multipath-tools/files/multipathd.oe0
-rw-r--r--meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb (renamed from meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb)19
18 files changed, 185 insertions, 128 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
index 74ae1530cb..909fd77ba2 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
@@ -1,7 +1,7 @@
1From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001 1From 68160e86472b197107c60bf6e5a3d126040e85b6 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 01/12] RH: fixup udev rules for redhat 4Subject: [PATCH] RH: fixup udev rules for redhat
5 5
6The multipath rules need to run after scsi_id is run. This means moving 6The multipath rules need to run after scsi_id is run. This means moving
7them after 60-persistent-storage.rules for redhat. Redhat also uses a 7them after 60-persistent-storage.rules for redhat. Redhat also uses a
@@ -18,17 +18,20 @@ Rebase to 0.9.8
18Signed-off-by: Changqing Li <changqing.li@windriver.com> 18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19 19
20Upstream-Status: Pending 20Upstream-Status: Pending
21
22Rebase to 0.10.0
23Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
21--- 24---
22 Makefile.inc | 2 +- 25 Makefile.inc | 2 +-
23 kpartx/kpartx.rules | 2 +- 26 kpartx/kpartx.rules.in | 2 +-
24 multipath/Makefile | 4 ++-- 27 multipath/Makefile | 4 ++--
25 3 files changed, 4 insertions(+), 4 deletions(-) 28 3 files changed, 4 insertions(+), 4 deletions(-)
26 29
27diff --git a/Makefile.inc b/Makefile.inc 30diff --git a/Makefile.inc b/Makefile.inc
28index 5668e638..de89b21f 100644 31index 729618bd..69521882 100644
29--- a/Makefile.inc 32--- a/Makefile.inc
30+++ b/Makefile.inc 33+++ b/Makefile.inc
31@@ -59,7 +59,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d 34@@ -62,7 +62,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d
32 modulesloaddir := $(systemd_prefix)lib/modules-load.d 35 modulesloaddir := $(systemd_prefix)lib/modules-load.d
33 libudevdir := $(systemd_prefix)lib/udev 36 libudevdir := $(systemd_prefix)lib/udev
34 udevrulesdir := $(libudevdir)/rules.d 37 udevrulesdir := $(libudevdir)/rules.d
@@ -37,16 +40,16 @@ index 5668e638..de89b21f 100644
37 mandir := $(usr_prefix)share/man 40 mandir := $(usr_prefix)share/man
38 LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib) 41 LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
39 syslibdir := $(prefix)$(LIB) 42 syslibdir := $(prefix)$(LIB)
40diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules 43diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
41index 1969dee0..d2b28233 100644 44index 9d879609..2049eb8f 100644
42--- a/kpartx/kpartx.rules 45--- a/kpartx/kpartx.rules.in
43+++ b/kpartx/kpartx.rules 46+++ b/kpartx/kpartx.rules.in
44@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" 47@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
45 GOTO="kpartx_end" 48 GOTO="kpartx_end"
46 49
47 LABEL="run_kpartx" 50 LABEL="run_kpartx"
48-RUN+="/sbin/kpartx -un -p -part /dev/$name" 51-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
49+RUN+="/sbin/kpartx -un /dev/$name" 52+RUN+="@BINDIR@/kpartx -un /dev/$name"
50 53
51 LABEL="kpartx_end" 54 LABEL="kpartx_end"
52diff --git a/multipath/Makefile b/multipath/Makefile 55diff --git a/multipath/Makefile b/multipath/Makefile
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..128a0c4d8d
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch
@@ -0,0 +1,28 @@
1From 1d444772db14f4acb8d47b874462b0cc171ab672 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 17 Feb 2025 12:01:59 -0800
4Subject: [PATCH] libmpathutils/uxsock.c: Include string.h for memcpy
5
6Fixes
7uxsock.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]
8
9Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250217200503.4166910-1-raj.khem@gmail.com/T/#u]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Cc: Benjamin Marzinski <bmarzins@redhat.com>
12Cc: Martin Wilck <mwilck@suse.com>
13---
14 libmpathutil/uxsock.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/libmpathutil/uxsock.c b/libmpathutil/uxsock.c
18index 2135476d..a474874e 100644
19--- a/libmpathutil/uxsock.c
20+++ b/libmpathutil/uxsock.c
21@@ -8,6 +8,7 @@
22 #include <stdlib.h>
23 #include <unistd.h>
24 #include <stdarg.h>
25+#include <string.h>
26 #include <fcntl.h>
27 #include <sys/ioctl.h>
28 #include <sys/types.h>
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
deleted file mode 100644
index 0365a7ef64..0000000000
--- a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Mar 2024 18:56:55 -0700
4Subject: [PATCH] libmultipath: always use glibc basename()
5
6There is a use of basename() which expects it to be GNU version of
7basename, which is not available in other libcs e.g. musl on Linux
8therefore provide a version for such cases
9
10Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 libmultipath/configure.c | 13 +++++++++++++
14 1 file changed, 13 insertions(+)
15
16diff --git a/libmultipath/configure.c b/libmultipath/configure.c
17index 4ecf6ba4..e81cc67c 100644
18--- a/libmultipath/configure.c
19+++ b/libmultipath/configure.c
20@@ -43,6 +43,19 @@
21 #include "sysfs.h"
22 #include "io_err_stat.h"
23
24+#ifndef __GLIBC__
25+/*
26+ * glibc's non-destructive version of basename()
27+ * License: LGPL-2.1-or-later
28+ */
29+static const char *__basename(const char *filename)
30+{
31+ char *p = strrchr(filename, '/');
32+ return p ? p + 1 : filename;
33+}
34+#define basename(x) __basename(x)
35+#endif
36+
37 /* group paths in pg by host adapter
38 */
39 int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
40--
412.44.0
42
diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
index 4b24bd2d35..a578280491 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -1,7 +1,7 @@
1From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001 1From e3449e163d7fe9bf1e188f0e28962f0659e9652d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 1 Mar 2024 10:34:06 +0800 3Date: Fri, 1 Mar 2024 10:34:06 +0800
4Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin 4Subject: [PATCH] RH: Remove the property blacklist exception builtin
5 5
6Multipath set the default property blacklist exceptions to 6Multipath set the default property blacklist exceptions to
7(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal 7(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal
@@ -13,21 +13,19 @@ it.
13 13
14Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> 14Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
15 15
16Upsteam-Status: Pending 16Upstream-Status: Pending
17 17
18[OP: Rebase to 0.9.3] 18[OP: Rebase to 0.9.3]
19Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> 19Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
20 20
21Rebase to 0.9.8 21Rebase to 0.9.8
22Signed-off-by: Changqing Li <changqing.li@windriver.com> 22Signed-off-by: Changqing Li <changqing.li@windriver.com>
23
24Upstream-Status: Pending
25--- 23---
26 libmultipath/blacklist.c | 16 +++++----------- 24 libmultipath/blacklist.c | 16 +++++-----------
27 1 file changed, 5 insertions(+), 11 deletions(-) 25 1 file changed, 5 insertions(+), 11 deletions(-)
28 26
29diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c 27diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
30index 75100b20..4fdaca76 100644 28index 17e1b54a..2cfb18b8 100644
31--- a/libmultipath/blacklist.c 29--- a/libmultipath/blacklist.c
32+++ b/libmultipath/blacklist.c 30+++ b/libmultipath/blacklist.c
33@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf) 31@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
index 54b3bdc863..649f1fa778 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
@@ -1,7 +1,7 @@
1From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001 1From 2fe1037b8198bd00961d8df48e684296758127d1 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 03/12] RH: don't start without a config file 4Subject: [PATCH] RH: don't start without a config file
5 5
6If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist 6If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist
7all devices when running multipath. A completely blank configuration file 7all devices when running multipath. A completely blank configuration file
@@ -28,7 +28,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
28 5 files changed, 23 insertions(+) 28 5 files changed, 23 insertions(+)
29 29
30diff --git a/libmultipath/config.c b/libmultipath/config.c 30diff --git a/libmultipath/config.c b/libmultipath/config.c
31index 83fa7369..8a3a8f37 100644 31index 8b424d18..d8fafa1f 100644
32--- a/libmultipath/config.c 32--- a/libmultipath/config.c
33+++ b/libmultipath/config.c 33+++ b/libmultipath/config.c
34@@ -26,6 +26,7 @@ 34@@ -26,6 +26,7 @@
@@ -39,7 +39,7 @@ index 83fa7369..8a3a8f37 100644
39 39
40 /* 40 /*
41 * We don't support re-initialization after 41 * We don't support re-initialization after
42@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf) 42@@ -937,6 +938,23 @@ int init_config__ (const char *file, struct config *conf)
43 } 43 }
44 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); 44 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
45 validate_pctable(conf->overrides, 0, file); 45 validate_pctable(conf->overrides, 0, file);
@@ -64,7 +64,7 @@ index 83fa7369..8a3a8f37 100644
64 64
65 conf->processed_main_config = 1; 65 conf->processed_main_config = 1;
66diff --git a/libmultipath/config.h b/libmultipath/config.h 66diff --git a/libmultipath/config.h b/libmultipath/config.h
67index 384193ab..158cebf0 100644 67index 5b4ebf8c..2302eacc 100644
68--- a/libmultipath/config.h 68--- a/libmultipath/config.h
69+++ b/libmultipath/config.h 69+++ b/libmultipath/config.h
70@@ -10,6 +10,7 @@ 70@@ -10,6 +10,7 @@
@@ -76,7 +76,7 @@ index 384193ab..158cebf0 100644
76 enum devtypes { 76 enum devtypes {
77 DEV_NONE, 77 DEV_NONE,
78diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in 78diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
79index 780bf852..2c518378 100644 79index 2ac1972f..cc248231 100644
80--- a/multipath/multipath.rules.in 80--- a/multipath/multipath.rules.in
81+++ b/multipath/multipath.rules.in 81+++ b/multipath/multipath.rules.in
82@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" 82@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
@@ -88,7 +88,7 @@ index 780bf852..2c518378 100644
88 ENV{DEVTYPE}!="partition", GOTO="test_dev" 88 ENV{DEVTYPE}!="partition", GOTO="test_dev"
89 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" 89 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
90diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in 90diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in
91index f1cab3ff..5ae21db1 100644 91index 7bc8806e..315884eb 100644
92--- a/multipathd/multipathd.8.in 92--- a/multipathd/multipathd.8.in
93+++ b/multipathd/multipathd.8.in 93+++ b/multipathd/multipathd.8.in
94@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy. 94@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy.
@@ -101,7 +101,7 @@ index f1cab3ff..5ae21db1 100644
101 . 101 .
102 .\" ---------------------------------------------------------------------------- 102 .\" ----------------------------------------------------------------------------
103diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in 103diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
104index 6d03ff71..0cd85102 100644 104index b6a25b31..f78bb91b 100644
105--- a/multipathd/multipathd.service.in 105--- a/multipathd/multipathd.service.in
106+++ b/multipathd/multipathd.service.in 106+++ b/multipathd/multipathd.service.in
107@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target 107@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
@@ -112,6 +112,3 @@ index 6d03ff71..0cd85102 100644
112 Before=initrd-cleanup.service 112 Before=initrd-cleanup.service
113 DefaultDependencies=no 113 DefaultDependencies=no
114 Conflicts=shutdown.target 114 Conflicts=shutdown.target
115--
1162.25.1
117
diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
index 91477a44cb..6556d4af85 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
@@ -1,7 +1,7 @@
1From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001 1From dd4f005ab3b38cee2776dcb0a0661c5a01befd00 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 04/12] RH: use rpm optflags if present 4Subject: [PATCH] RH: use rpm optflags if present
5 5
6Use the passed in optflags when compiling as an RPM, and keep the 6Use the passed in optflags when compiling as an RPM, and keep the
7default flags as close as possible to the current fedora flags, while 7default flags as close as possible to the current fedora flags, while
@@ -16,15 +16,18 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
16 16
17Rebase to 0.9.8 17Rebase to 0.9.8
18Signed-off-by: Changqing Li <changqing.li@windriver.com> 18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19
20Rebase to 0.10.0
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19--- 22---
20 Makefile.inc | 12 ++++++++++-- 23 Makefile.inc | 12 ++++++++++--
21 1 file changed, 10 insertions(+), 2 deletions(-) 24 1 file changed, 10 insertions(+), 2 deletions(-)
22 25
23diff --git a/Makefile.inc b/Makefile.inc 26diff --git a/Makefile.inc b/Makefile.inc
24index de89b21f..6ac632ff 100644 27index 69521882..2127f208 100644
25--- a/Makefile.inc 28--- a/Makefile.inc
26+++ b/Makefile.inc 29+++ b/Makefile.inc
27@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo 30@@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
28 MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ 31 MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
29 echo "modprobe@dm_multipath.service") 32 echo "modprobe@dm_multipath.service")
30 33
@@ -38,18 +41,18 @@ index de89b21f..6ac632ff 100644
38+ -Werror=implicit-function-declaration -Wno-sign-compare \ 41+ -Werror=implicit-function-declaration -Wno-sign-compare \
39+ -Wno-unused-parameter -Werror=cast-qual \ 42+ -Wno-unused-parameter -Werror=cast-qual \
40+ -Werror=discarded-qualifiers 43+ -Werror=discarded-qualifiers
41 WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ 44
42 -Werror=implicit-function-declaration -Werror=format-security \ 45 # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
43 $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) 46 WARN_ONLY :=
44@@ -105,7 +113,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ 47@@ -115,7 +123,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
45 -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ 48 -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
46 -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ 49 -DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \
47 -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP 50 -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
48-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe 51-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
49+CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe 52+CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe \
53 -fexceptions
50 BIN_CFLAGS := -fPIE -DPIE 54 BIN_CFLAGS := -fPIE -DPIE
51 LIB_CFLAGS := -fPIC 55 LIB_CFLAGS := -fPIC
52 SHARED_FLAGS := -shared
53-- 56--
542.25.1 572.25.1
55 58
diff --git a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
index c6089612b3..e7ea374cd1 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
@@ -1,7 +1,7 @@
1From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001 1From 4035b48b512b5010b1c33aeba8c58cf2705bca83 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 05/12] RH: add mpathconf 4Subject: [PATCH] RH: add mpathconf
5 5
6mpathconf is a program (largely based on lvmcomf) to help users 6mpathconf is a program (largely based on lvmcomf) to help users
7configure /etc/multipath.conf and enable or disable multipathing. It 7configure /etc/multipath.conf and enable or disable multipathing. It
@@ -29,10 +29,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
29 create mode 100644 multipath/mpathconf.8 29 create mode 100644 multipath/mpathconf.8
30 30
31diff --git a/libmultipath/config.c b/libmultipath/config.c 31diff --git a/libmultipath/config.c b/libmultipath/config.c
32index 8a3a8f37..a40b41ab 100644 32index d8fafa1f..cba7994b 100644
33--- a/libmultipath/config.c 33--- a/libmultipath/config.c
34+++ b/libmultipath/config.c 34+++ b/libmultipath/config.c
35@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf) 35@@ -940,6 +940,7 @@ int init_config__ (const char *file, struct config *conf)
36 validate_pctable(conf->overrides, 0, file); 36 validate_pctable(conf->overrides, 0, file);
37 } else { 37 } else {
38 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); 38 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
@@ -648,6 +648,3 @@ index 00000000..4cd32672
648+.BR service (8), 648+.BR service (8),
649+.SH AUTHOR 649+.SH AUTHOR
650+Benjamin Marzinski <bmarzins@redhat.com> 650+Benjamin Marzinski <bmarzins@redhat.com>
651--
6522.25.1
653
diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
index 8df7de3b48..04160eaac5 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,7 +1,7 @@
1From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001 1From bd65cdc704666dd4153779c74cdbb2cac6efea71 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 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A 4Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A
5 5
6This patch adds another option to multipath, "-A", which reads 6This patch adds another option to multipath, "-A", which reads
7/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds 7/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
27 2 files changed, 45 insertions(+) 27 2 files changed, 45 insertions(+)
28 28
29diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c 29diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
30index 591cd09b..b01f1b85 100644 30index aac18c04..68f8e373 100644
31--- a/libmultipath/wwids.c 31--- a/libmultipath/wwids.c
32+++ b/libmultipath/wwids.c 32+++ b/libmultipath/wwids.c
33@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid) 33@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid)
@@ -79,7 +79,7 @@ index 591cd09b..b01f1b85 100644
79+ return ret; 79+ return ret;
80+} 80+}
81diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h 81diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
82index 0c6ee54d..e32a0b0e 100644 82index ee47ad9f..1ed0d85e 100644
83--- a/libmultipath/wwids.h 83--- a/libmultipath/wwids.h
84+++ b/libmultipath/wwids.h 84+++ b/libmultipath/wwids.h
85@@ -17,6 +17,7 @@ int remember_wwid(char *wwid); 85@@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
index c64b8aeabc..b435e6d677 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
@@ -1,7 +1,7 @@
1From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 1From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 1 Mar 2024 11:45:10 +0800 3Date: Fri, 1 Mar 2024 11:45:10 +0800
4Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing 4Subject: [PATCH] RH: warn on invalid regex instead of failing
5 5
6multipath.conf used to allow "*" as a match everything regular expression, 6multipath.conf used to allow "*" as a match everything regular expression,
7instead of requiring ".*". Instead of erroring when the old style 7instead of requiring ".*". Instead of erroring when the old style
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
23 1 file changed, 34 insertions(+), 6 deletions(-) 23 1 file changed, 34 insertions(+), 6 deletions(-)
24 24
25diff --git a/libmultipath/dict.c b/libmultipath/dict.c 25diff --git a/libmultipath/dict.c b/libmultipath/dict.c
26index 5af036b7..e494419d 100644 26index a06a6138..a734ba9b 100644
27--- a/libmultipath/dict.c 27--- a/libmultipath/dict.c
28+++ b/libmultipath/dict.c 28+++ b/libmultipath/dict.c
29@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) 29@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr)
@@ -61,7 +61,7 @@ index 5af036b7..e494419d 100644
61 static int 61 static int
62 set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) 62 set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
63 { 63 {
64@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ 64@@ -1854,7 +1882,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \
65 if (!conf->option) \ 65 if (!conf->option) \
66 return 1; \ 66 return 1; \
67 \ 67 \
@@ -70,7 +70,7 @@ index 5af036b7..e494419d 100644
70 if (!buff) \ 70 if (!buff) \
71 return 1; \ 71 return 1; \
72 \ 72 \
73@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ 73@@ -1874,7 +1902,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
74 if (!conf->option) \ 74 if (!conf->option) \
75 return 1; \ 75 return 1; \
76 \ 76 \
@@ -79,7 +79,7 @@ index 5af036b7..e494419d 100644
79 if (!buff) \ 79 if (!buff) \
80 return 1; \ 80 return 1; \
81 \ 81 \
82@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, 82@@ -1980,16 +2008,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
83 return 0; 83 return 0;
84 } 84 }
85 85
diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
index 1fa1f3be27..9ea255cbcb 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
@@ -1,7 +1,7 @@
1From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001 1From 87e19d273c46fe78933627fc4e8046e3a76da47a 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:12:01 +0800 3Date: Mon, 26 Nov 2018 11:12:01 +0800
4Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off 4Subject: [PATCH] RH: reset default find_mutipaths value to off
5 5
6Upstream has changed to default find_multipaths to "strict". For now 6Upstream has changed to default find_multipaths to "strict". For now
7Redhat will retain the previous default of "off". 7Redhat will retain the previous default of "off".
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h 19diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
20index 64b633f2..a06a8a41 100644 20index 02f7e57c..98dd66f7 100644
21--- a/libmultipath/defaults.h 21--- a/libmultipath/defaults.h
22+++ b/libmultipath/defaults.h 22+++ b/libmultipath/defaults.h
23@@ -23,7 +23,7 @@ 23@@ -24,7 +24,7 @@
24 #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF 24 #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF
25 #define DEFAULT_VERBOSITY 2 25 #define DEFAULT_VERBOSITY 2
26 #define DEFAULT_REASSIGN_MAPS 0 26 #define DEFAULT_REASSIGN_MAPS 0
diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
index 041b79a9af..661e38f684 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
@@ -1,7 +1,7 @@
1From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001 1From c22c897e7c55fc0b8c5bdd113a0357654ee895ae 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 09/12] multipath-tools: modify create-config.mk for 4Subject: [PATCH] multipath-tools: modify create-config.mk for
5 cross-compilation 5 cross-compilation
6 6
7Do not look for systemd info on the host, and allow us to pass in CFLAGS 7Do not look for systemd info on the host, and allow us to pass in CFLAGS
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
21 1 file changed, 4 deletions(-) 21 1 file changed, 4 deletions(-)
22 22
23diff --git a/create-config.mk b/create-config.mk 23diff --git a/create-config.mk b/create-config.mk
24index 4d318b96..a65975ba 100644 24index 8bd2c20c..40d2446a 100644
25--- a/create-config.mk 25--- a/create-config.mk
26+++ b/create-config.mk 26+++ b/create-config.mk
27@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) 27@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
index b48720b8a1..cf053680f6 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
@@ -1,7 +1,7 @@
1From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 1From c34c65a3f5ddec22cb417872f90c2c9540a1847b 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 10/12] Subject: [PATCH] Always use devmapper 4Subject: [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,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
21 1 file changed, 8 insertions(+), 28 deletions(-) 21 1 file changed, 8 insertions(+), 28 deletions(-)
22 22
23diff --git a/create-config.mk b/create-config.mk 23diff --git a/create-config.mk b/create-config.mk
24index a65975ba..8ba592f4 100644 24index 40d2446a..f5eb2803 100644
25--- a/create-config.mk 25--- a/create-config.mk
26+++ b/create-config.mk 26+++ b/create-config.mk
27@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ 27@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
index abaea2cfb6..0c5015142c 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
@@ -1,7 +1,7 @@
1From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001 1From 698361847e6fae321bc277a5fc518b2bd55751b8 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 11/12] fix bug of do_compile and do_install 4Subject: [PATCH] fix bug of do_compile and do_install
5 5
6when multiple processes make run in parallel, 6when multiple processes make run in parallel,
7because of dependency error will occur. 7because of dependency error will occur.
@@ -18,10 +18,10 @@ Upstream-Status: Pending
18 1 file changed, 10 insertions(+) 18 1 file changed, 10 insertions(+)
19 19
20diff --git a/Makefile b/Makefile 20diff --git a/Makefile b/Makefile
21index 4df5f161..065249c2 100644 21index f06f7faa..690dc050 100644
22--- a/Makefile 22--- a/Makefile
23+++ b/Makefile 23+++ b/Makefile
24@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath 24@@ -94,6 +94,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
25 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath 25 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
26 mpathpersist multipathd: libmpathpersist 26 mpathpersist multipathd: libmpathpersist
27 27
diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
index 2f774940d6..f47d8afe4b 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
@@ -1,7 +1,7 @@
1From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001 1From 69ee17207574ca032c3cb46a3db99736de3eedf8 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 12/12] add explicit dependency on libraries 4Subject: [PATCH] add explicit dependency on libraries
5 5
6[snip] 6[snip]
7gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist 7gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist
@@ -24,10 +24,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
24 1 file changed, 1 insertion(+) 24 1 file changed, 1 insertion(+)
25 25
26diff --git a/Makefile b/Makefile 26diff --git a/Makefile b/Makefile
27index 065249c2..0444c2ea 100644 27index 690dc050..b775f949 100644
28--- a/Makefile 28--- a/Makefile
29+++ b/Makefile 29+++ b/Makefile
30@@ -90,6 +90,7 @@ libmultipath: libmpathutil 30@@ -93,6 +93,7 @@ libmultipath: libmpathutil
31 libmpathpersist libmpathvalid multipath multipathd: libmultipath 31 libmpathpersist libmpathvalid multipath multipathd: libmultipath
32 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath 32 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
33 mpathpersist multipathd: libmpathpersist 33 mpathpersist multipathd: libmpathpersist
diff --git a/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch
new file mode 100644
index 0000000000..4cca7decb8
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch
@@ -0,0 +1,29 @@
1From bcb052a8dadbd0a837986b1e15924b469fc59edc Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
3Date: Thu, 3 Apr 2025 10:08:49 +0200
4Subject: [PATCH] libdmmp/Makefile: Fix KBUILD_BUILD_TIMESTAMP usage
5
6Add missing $ (Makefile need to escape '$' as '$$')
7
8Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250404122902.2750036-1-sofiane.hamam@smile.fr/]
9
10Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
11Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
12Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
13---
14 libdmmp/Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/libdmmp/Makefile b/libdmmp/Makefile
18index 172ba045..7e0e2509 100644
19--- a/libdmmp/Makefile
20+++ b/libdmmp/Makefile
21@@ -74,7 +74,7 @@ doc: docs/man/dmmp_strerror.3
22 docs/man/dmmp_strerror.3: $(HEADERS)
23 $(Q)TEMPFILE=$(shell mktemp); \
24 cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
25- [ "$KBUILD_BUILD_TIMESTAMP" ] || \
26+ [ "$$KBUILD_BUILD_TIMESTAMP" ] || \
27 KBUILD_BUILD_TIMESTAMP=`git log -n1 --pretty=%cd --date=iso -- $^`; \
28 export KBUILD_BUILD_TIMESTAMP; \
29 LC_ALL=C \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch b/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch
new file mode 100644
index 0000000000..aad46c229b
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch
@@ -0,0 +1,41 @@
1From 6e231d887c20b2139db75e6dc6c20107273aaacd Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
3Date: Thu, 3 Apr 2025 10:25:30 +0200
4Subject: [PATCH] libdmmp/Makefile: Add target docs/man/dmmp_strerror.3 to
5 .PHONY list
6
7When cloning git repos, depending on the order of written to the disk, target
8docs/man/dmmp_strerror.3 is more recent that the prerequisite
9libdmmp/libdmmp.h this leads to a non reproducible behavior:
10Sometimes, the timestamps are updated in the man pages, sometimes not.
11
12Upstream-Status: Denied
13
14https://lore.kernel.org/dm-devel/72355f1d0984647e91f8c50f1c2295071af49e33.camel@suse.com/
15The patch has been rejected by upstream, who will update the timestamps of the
16manpages with a new commit.
17In order to be reproducible without having a random result, forcing the target
18rebuild by adding it to .PHONY is the more acceptable solution, the alternative
19would have been to use the make -B option which consider all target has
20obsolete and rebuild them all, which is less efficient.
21
22Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
23Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
24Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
25---
26 libdmmp/Makefile | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/libdmmp/Makefile b/libdmmp/Makefile
30index 7e0e2509..187bcb8c 100644
31--- a/libdmmp/Makefile
32+++ b/libdmmp/Makefile
33@@ -20,7 +20,7 @@ CFLAGS += $(LIB_CFLAGS) -fvisibility=hidden
34 LIBDEPS += $(shell $(PKG_CONFIG) --libs json-c) -L$(mpathcmddir) -lmpathcmd -lpthread
35
36 all: $(LIBS) doc
37-.PHONY: doc clean install uninstall check speed_test dep_clean
38+.PHONY: doc clean install uninstall check speed_test dep_clean docs/man/dmmp_strerror.3
39
40 $(LIBS): $(OBJS)
41 $(Q)$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
diff --git a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
index 3bdf875e3c..3bdf875e3c 100755..100644
--- a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
+++ b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb
index e9f01bd1fe..07bc84ce8b 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb
@@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \
29 29
30LICENSE = "GPL-2.0-only" 30LICENSE = "GPL-2.0-only"
31 31
32SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ 32SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=stable-0.11.y \
33 file://multipathd.oe \ 33 file://multipathd.oe \
34 file://multipath.conf.example \ 34 file://multipath.conf.example \
35 file://0001-RH-fixup-udev-rules-for-redhat.patch \ 35 file://0001-RH-fixup-udev-rules-for-redhat.patch \
@@ -41,17 +41,18 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=ma
41 file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \ 41 file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \
42 file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \ 42 file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \
43 file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \ 43 file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \
44 file://0010-Subject-PATCH-Always-use-devmapper.patch \ 44 file://0010-Always-use-devmapper.patch \
45 file://0011-fix-bug-of-do_compile-and-do_install.patch \ 45 file://0011-fix-bug-of-do_compile-and-do_install.patch \
46 file://0012-add-explicit-dependency-on-libraries.patch \ 46 file://0012-add-explicit-dependency-on-libraries.patch \
47 file://0001-libmultipath-always-use-glibc-basename.patch \ 47 file://0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch \
48 file://0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch \
49 file://0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \
48 " 50 "
49 51
50LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 52LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
51 53
52SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199" 54SRCREV = "cb8de98b2cc3b62fd1a578ba479c0820778e9c02"
53 55
54S = "${WORKDIR}/git"
55 56
56inherit systemd pkgconfig 57inherit systemd pkgconfig
57 58
@@ -73,6 +74,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
73EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ 74EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
74 OPTFLAGS="${CFLAGS}" \ 75 OPTFLAGS="${CFLAGS}" \
75 prefix=${prefix} \ 76 prefix=${prefix} \
77 etc_prefix=${sysconfdir} \
76 bindir=${base_sbindir} \ 78 bindir=${base_sbindir} \
77 LIB=${base_libdir} libdir=${base_libdir}/multipath \ 79 LIB=${base_libdir} libdir=${base_libdir}/multipath \
78 usrlibdir=${libdir} \ 80 usrlibdir=${libdir} \
@@ -82,6 +84,7 @@ EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
82 modulesloaddir=${sysconfdir}/modules-load.d \ 84 modulesloaddir=${sysconfdir}/modules-load.d \
83 tmpfilesdir=${sysconfdir}/tmpfiles.d \ 85 tmpfilesdir=${sysconfdir}/tmpfiles.d \
84 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ 86 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \
87 KBUILD_BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH" +"%Y-%m-%d %H:%M:%S +0000")" \
85 ' 88 '
86 89
87do_install() { 90do_install() {
@@ -91,14 +94,14 @@ do_install() {
91 # 94 #
92 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then 95 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then
93 install -d ${D}${sysconfdir}/init.d 96 install -d ${D}${sysconfdir}/init.d
94 cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd 97 cp ${UNPACKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd
95 fi 98 fi
96 99
97 sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ 100 sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \
98 ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules 101 ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules
99 102
100 install -d ${D}${sysconfdir} 103 install -d ${D}${sysconfdir}
101 install -m 0644 ${WORKDIR}/multipath.conf.example \ 104 install -m 0644 ${UNPACKDIR}/multipath.conf.example \
102 ${D}${sysconfdir}/multipath.conf.example 105 ${D}${sysconfdir}/multipath.conf.example
103} 106}
104 107
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 21:24:43 +0000