diff options
| author | Liu Yiding <liuyd.fnst@fujitsu.com> | 2026-01-29 17:05:25 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-01-30 23:59:12 -0800 |
| commit | 6354dcfaa89bb77076425a56ff16bee9ebaac85c (patch) | |
| tree | bbf7c427a7606dc9bdc25a36c138d61fa5984b9c | |
| parent | 1b4b952b5127ed9c35cae0c6cfd6e1133c79a946 (diff) | |
| download | meta-openembedded-6354dcfaa89bb77076425a56ff16bee9ebaac85c.tar.gz | |
multipath-tools: upgrade 0.12.1 -> 0.12.2
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb (renamed from meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb) | 2 |
2 files changed, 13 insertions, 10 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 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 @@ | |||
| 1 | From c34eca043178e60ff04dc88953a71b36ce9dc1b0 Mon Sep 17 00:00:00 2001 | 1 | From 5544371deb70e091e86d07f2755396b8a49729d7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Liu Yiding <liuyd.fnst@fujitsu.com> |
| 3 | Date: Mon, 26 Nov 2018 09:19:17 +0800 | 3 | Date: Wed, 28 Jan 2026 09:56:19 +0000 |
| 4 | Subject: [PATCH] RH: use rpm optflags if present | 4 | Subject: [PATCH] RH: use rpm optflags if present |
| 5 | 5 | ||
| 6 | Use the passed in optflags when compiling as an RPM, and keep the | 6 | 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> | |||
| 22 | 22 | ||
| 23 | Rebase to 0.12.1 | 23 | Rebase to 0.12.1 |
| 24 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | 24 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> |
| 25 | |||
| 26 | Rebase to 0.12.2 | ||
| 27 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | ||
| 25 | --- | 28 | --- |
| 26 | Makefile.inc | 12 ++++++++++-- | 29 | Makefile.inc | 12 ++++++++++-- |
| 27 | 1 file changed, 10 insertions(+), 2 deletions(-) | 30 | 1 file changed, 10 insertions(+), 2 deletions(-) |
| 28 | 31 | ||
| 29 | diff --git a/Makefile.inc b/Makefile.inc | 32 | diff --git a/Makefile.inc b/Makefile.inc |
| 30 | index d04a3175..eb339251 100644 | 33 | index 7ca96e58..8e168dc8 100644 |
| 31 | --- a/Makefile.inc | 34 | --- a/Makefile.inc |
| 32 | +++ b/Makefile.inc | 35 | +++ b/Makefile.inc |
| 33 | @@ -102,7 +102,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo | 36 | @@ -108,7 +108,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo |
| 34 | MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ | 37 | MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ |
| 35 | echo "modprobe@dm_multipath.service") | 38 | echo "modprobe@dm_multipath.service") |
| 36 | 39 | ||
| 37 | -OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | 40 | -OPTFLAGS := $(OPT) -g $(STACKPROT) --param=ssp-buffer-size=4 |
| 38 | +ifndef RPM_OPT_FLAGS | 41 | +ifndef RPM_OPT_FLAGS |
| 39 | + OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 | 42 | + OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 |
| 40 | +else | 43 | +else |
| @@ -47,13 +50,13 @@ index d04a3175..eb339251 100644 | |||
| 47 | 50 | ||
| 48 | # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development. | 51 | # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development. |
| 49 | WARN_ONLY := | 52 | WARN_ONLY := |
| 50 | @@ -121,7 +129,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ | 53 | @@ -127,7 +135,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) $(D_CMOCKA_VERSION) \ |
| 51 | -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \ | 54 | -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \ |
| 52 | -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \ | 55 | -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \ |
| 53 | -MMD -MP | 56 | -MMD -MP |
| 54 | -CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ | 57 | -CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ |
| 55 | +CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \ | 58 | +CFLAGS := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \ |
| 56 | -fexceptions | 59 | -fexceptions -fno-strict-aliasing $(if $(ASAN),-fsanitize=address) |
| 57 | BIN_CFLAGS := -fPIE -DPIE | 60 | BIN_CFLAGS := -fPIE -DPIE |
| 58 | LIB_CFLAGS := -fPIC | 61 | LIB_CFLAGS := -fPIC |
| 59 | -- | 62 | -- |
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 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 | |||
| 49 | 49 | ||
| 50 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f" | 50 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f" |
| 51 | 51 | ||
| 52 | SRCREV = "a1f7f3d5b4972c39e8950c722a04c21a9e030a31" | 52 | SRCREV = "5bd1163d187520b958d78b85c7b239561dc86192" |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | inherit systemd pkgconfig | 55 | inherit systemd pkgconfig |
