mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-14 03:57:15 +00:00
multipath-tools: upgrade 0.12.2 -> 0.15.1
Refresh 0007-RH-warn-on-invalid-regex-instead-of-failing.patch; both ble handler macros now read the value with set_value(), switch the second one to set_regex_value() as well. Add 0014-libmpathutil-Drop-undefined-get_persistent_runner-from-ver.patch: the version script lists a symbol that is not defined, which fails to link with lld. The 0.15.1 release commit is on master; there is no stable-0.15.y branch yet and stable-0.12.y does not contain it, so the fetch failed. Fetch by the tag without a branch, which also holds for later releases on a stable branch. Tested by building multipath-tools for corei7-64. AI-Generated: Uses Claude Code (Claude Opus 5.5) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
3 files changed
+32
-6
No files matched your search
+4
-4
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
1 file changed, 34 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libmultipath/dict.c b/libmultipath/dict.c
|
||||
index a06a6138..a734ba9b 100644
|
||||
index 0e947b1..c477522 100644
|
||||
--- a/libmultipath/dict.c
|
||||
+++ b/libmultipath/dict.c
|
||||
@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr)
|
||||
@@ -61,7 +61,7 @@ index a06a6138..a734ba9b 100644
|
||||
static int
|
||||
set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
|
||||
{
|
||||
@@ -1854,7 +1882,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \
|
||||
@@ -1801,7 +1829,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \
|
||||
if (!conf->option) \
|
||||
return 1; \
|
||||
\
|
||||
@@ -70,7 +70,7 @@ index a06a6138..a734ba9b 100644
|
||||
if (!buff) \
|
||||
return 1; \
|
||||
\
|
||||
@@ -1874,7 +1902,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
|
||||
@@ -1821,7 +1849,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
|
||||
if (!conf->option) \
|
||||
return 1; \
|
||||
\
|
||||
@@ -79,7 +79,7 @@ index a06a6138..a734ba9b 100644
|
||||
if (!buff) \
|
||||
return 1; \
|
||||
\
|
||||
@@ -1980,16 +2008,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
|
||||
@@ -1927,16 +1955,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <khem.raj@oss.qualcomm.com>
|
||||
Date: Thu, 12 Nov 2026 00:00:00 -0800
|
||||
Subject: [PATCH] libmpathutil: Drop undefined get_persistent_runner from
|
||||
version script
|
||||
|
||||
get_persistent_runner is listed in libmpathutil.version but is not
|
||||
defined anywhere, which fails linking with lld, as it defaults to
|
||||
--no-undefined-version:
|
||||
|
||||
ld.lld: error: version script assignment of 'LIBMPATHUTIL_6.0' to symbol 'get_persistent_runner' failed: symbol not defined
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
|
||||
---
|
||||
--- a/libmpathutil/libmpathutil.version
|
||||
+++ b/libmpathutil/libmpathutil.version
|
||||
@@ -73,7 +73,6 @@
|
||||
free_strvec;
|
||||
get_linux_version_code;
|
||||
get_monotonic_time;
|
||||
- get_persistent_runner;
|
||||
get_runner;
|
||||
get_strbuf_buf__;
|
||||
get_next_string;
|
||||
+3
-2
@@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \
|
||||
|
||||
LICENSE = "GPL-2.0-only"
|
||||
|
||||
SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=stable-0.12.y \
|
||||
SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;nobranch=1;tag=${PV} \
|
||||
file://multipathd.oe \
|
||||
file://multipath.conf.example \
|
||||
file://0001-RH-fixup-udev-rules-for-redhat.patch \
|
||||
@@ -45,11 +45,12 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=st
|
||||
file://0011-fix-bug-of-do_compile-and-do_install.patch \
|
||||
file://0012-add-explicit-dependency-on-libraries.patch \
|
||||
file://0013-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \
|
||||
file://0014-libmpathutil-Drop-undefined-get_persistent_runner-from-ver.patch \
|
||||
"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
|
||||
|
||||
SRCREV = "5bd1163d187520b958d78b85c7b239561dc86192"
|
||||
SRCREV = "d53932bdbee02f440518ea384e63d7c4d3f66685"
|
||||
|
||||
|
||||
inherit systemd pkgconfig
|
||||
Reference in new issue
Block a user