2 files changed, 17 insertions, 11 deletions

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 5f65ceaa29..8fad8d5645 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
@@ -19,23 +19,26 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 
 Rebase to 0.10.0
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+
+Rebase to 0.12.1
+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 596e68c0..42766867 100644
+index d04a3175..eb339251 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
+@@ -102,7 +102,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
 +ifndef RPM_OPT_FLAGS
-+       OPTFLAGS        := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
++       OPTFLAGS        := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
 +else
-+       OPTFLAGS = $(RPM_OPT_FLAGS)
++       OPTFLAGS = $(RPM_OPT_FLAGS)
 +endif
 +OPTFLAGS       += -Wextra -Wstrict-prototypes -Wformat=0 -Werror=implicit-int \
 +                  -Werror=implicit-function-declaration -Wno-sign-compare \
@@ -44,12 +47,15 @@ index 596e68c0..42766867 100644
  
  # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
  WARN_ONLY       :=
-@@ -115,7 +123,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
-                   -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
-                   -DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \
-                   -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
+@@ -121,7 +129,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_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 \
++CFLAGS          := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \
                    -fexceptions
  BIN_CFLAGS     := -fPIE -DPIE
  LIB_CFLAGS     := -fPIC
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.3.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb
index 8e26d4c2a8..20d9b6a1b5 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.3.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb
@@ -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.11.y \
+SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=stable-0.12.y \
            file://multipathd.oe \
            file://multipath.conf.example \
            file://0001-RH-fixup-udev-rules-for-redhat.patch \
@@ -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 = "7a84cc602ea0884ae0c767e6c89592059012db04"
+SRCREV = "a1f7f3d5b4972c39e8950c722a04c21a9e030a31"
 
 
 inherit systemd pkgconfig