diff mbox series

[meta-oe] multipath-tools: upgrade 0.12.1 -> 0.12.2

Message ID 20260129090525.9368-1-liuyd.fnst@fujitsu.com
State New
Headers show
Series [meta-oe] multipath-tools: upgrade 0.12.1 -> 0.12.2 | expand

Commit Message

Liu Yiding Jan. 29, 2026, 9:05 a.m. UTC 
1. Changelog
  https://github.com/opensvc/multipath-tools/releases/tag/0.12.2

2. Update 0004-RH-use-rpm-optflags-if-present.patch for 0.12.2

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 .../0004-RH-use-rpm-optflags-if-present.patch | 21 +++++++++++--------
 ...ls_0.12.1.bb => multipath-tools_0.12.2.bb} |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)
 rename meta-oe/recipes-support/multipath-tools/{multipath-tools_0.12.1.bb => multipath-tools_0.12.2.bb} (98%)
diff mbox series

Patch

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 8fad8d5645..1e8b69abf7 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,6 +1,6 @@ 
-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
+From 5544371deb70e091e86d07f2755396b8a49729d7 Mon Sep 17 00:00:00 2001
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
+Date: Wed, 28 Jan 2026 09:56:19 +0000
 Subject: [PATCH] RH: use rpm optflags if present
 
 Use the passed in optflags when compiling as an RPM, and keep the
@@ -22,19 +22,22 @@  Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 
 Rebase to 0.12.1
 Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
+
+Rebase to 0.12.2
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  Makefile.inc | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index d04a3175..eb339251 100644
+index 7ca96e58..8e168dc8 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -102,7 +102,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
+@@ -108,7 +108,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
  MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
  			echo "modprobe@dm_multipath.service")
  
--OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
+-OPTFLAGS	:= $(OPT) -g $(STACKPROT) --param=ssp-buffer-size=4
 +ifndef RPM_OPT_FLAGS
 +       OPTFLAGS        := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
 +else
@@ -47,13 +50,13 @@  index d04a3175..eb339251 100644
  
  # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
  WARN_ONLY       :=
-@@ -121,7 +129,7 @@ CPPFLAGS	:= $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
+@@ -127,7 +135,7 @@ CPPFLAGS	:= $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) $(D_CMOCKA_VERSION) \
  		   -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \
  		   -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \
  		   -MMD -MP
 -CFLAGS		:= -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
-+CFLAGS          := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \
- 		   -fexceptions
++CFLAGS         := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \
+ 		   -fexceptions -fno-strict-aliasing $(if $(ASAN),-fsanitize=address)
  BIN_CFLAGS	:= -fPIE -DPIE
  LIB_CFLAGS	:= -fPIC
 -- 
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
similarity index 98%
rename from meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb
rename to meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
index 20d9b6a1b5..bfb75718f2 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
@@ -49,7 +49,7 @@  SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=st
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
 
-SRCREV = "a1f7f3d5b4972c39e8950c722a04c21a9e030a31"
+SRCREV = "5bd1163d187520b958d78b85c7b239561dc86192"
 
 
 inherit systemd pkgconfig