package/multipath-tools: bump to version 0.8.5
PATCH 1/1 package/multipath-tools: bump to version 0.8.5
Change github URL to https://github.com/opensvc/multipath-tools
which offers proper releases.
Signed-off-by Alexander Egorenkov <[email protected]>
---
...ath-use-pkg-config-to-get-path-to-he.patch | 28 +++++++++----
...le-systemd-if-ENABLE_SYSTEMD-is-def.patch} | 0
...bmpathpersist-depend-on-libmultipath.patch | 31 --------------
...3-fix-boolean-value-with-json-c-0.14.patch | 41 -------------------
...ools-Makefile-add-install-dependency.patch | 34 ---------------
package/multipath-tools/multipath-tools.hash | 2 +-
package/multipath-tools/multipath-tools.mk | 4 +-
7 files changed, 22 insertions(+), 118 deletions(-)
rename package/multipath-tools/{0005-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch => 0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch} (100%)
delete mode 100644 package/multipath-tools/0002-libmpathpersist-depend-on-libmultipath.patch
delete mode 100644 package/multipath-tools/0003-fix-boolean-value-with-json-c-0.14.patch
delete mode 100644 package/multipath-tools/0004-multipath-tools-Makefile-add-install-dependency.patchpackage/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch +19 -9
@@ -1,7 +1,7 @@ -From f55b1a37e2c43b67e7fd7f6a39afe2b2316b7cf9 Mon Sep 17 00:00:00 2001 +From 922855e245c8bdadc0d24b5b706549b18fb5f079 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov <[email protected]> -Date: Mon, 31 Aug 2020 19:05:46 +0200 -Subject: [PATCH] kpartx, libmultipath: use pkg-config to get path to +Date: Sat, 21 Nov 2020 11:08:56 +0100 +Subject: [PATCH 1/1] kpartx, libmultipath: use pkg-config to get path to headers Use pkg-config in Makefile to find path to devmapper and udev headers
@@ -9,9 +9,9 @@ to enable cross-compilation. Signed-off-by: Alexander Egorenkov <[email protected]> --- - kpartx/Makefile | 2 +- - libmultipath/Makefile | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) + kpartx/Makefile | 2 +- + libmultipath/Makefile | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kpartx/Makefile b/kpartx/Makefile index 2906a984..29573890 100644
@@ -27,10 +27,10 @@ index 2906a984..29573890 100644 endif diff --git a/libmultipath/Makefile b/libmultipath/Makefile -index e5651e49..51ad0193 100644 +index 62ba16e8..3ad9130c 100644 --- a/libmultipath/Makefile +++ b/libmultipath/Makefile -@@ -20,19 +20,19 @@ ifdef SYSTEMD +@@ -20,27 +20,27 @@ ifdef SYSTEMD endif endif
@@ -39,6 +39,11 @@ index e5651e49..51ad0193 100644 CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE endif +-ifneq ($(call check_func,dm_task_get_errno,/usr/include/libdevmapper.h),0) ++ifneq ($(call check_func,dm_task_get_errno,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) + CFLAGS += -DLIBDM_API_GET_ERRNO + endif + -ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) +ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) CFLAGS += -DLIBDM_API_COOKIE
@@ -54,6 +59,11 @@ index e5651e49..51ad0193 100644 CFLAGS += -DLIBDM_API_DEFERRED endif +-ifneq ($(call check_func,dm_hold_control_dev,/usr/include/libdevmapper.h),0) ++ifneq ($(call check_func,dm_hold_control_dev,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) + CFLAGS += -DLIBDM_API_HOLD_CONTROL + endif + -- -2.28.0 +2.29.2
package/multipath-tools/0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch renamed from package/multipath-tools/0005-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch +0 -0
package/multipath-tools/0002-libmpathpersist-depend-on-libmultipath.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 48f537b9fef4f9db761466b8951fb63243f06602 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <[email protected]> -Date: Wed, 6 May 2020 09:35:47 +0200 -Subject: [PATCH] libmpathpersist: depend on libmultipath - -Without this the build fails with: - -/usr/bin/ld: cannot find -lmultipath - -Signed-off-by: Christian Hesse <[email protected]> -Signed-off-by: Alexander Egorenkov <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1dee3680..ba1d73ba 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ all: $(BUILDDIRS) - $(BUILDDIRS): - $(MAKE) -C $@ - --multipath multipathd mpathpersist: libmultipath -+libmpathpersist multipath multipathd mpathpersist: libmultipath - mpathpersist: libmpathpersist - - $(BUILDDIRS.clean): --- -2.28.0 -
package/multipath-tools/0003-fix-boolean-value-with-json-c-0.14.patch deleted +0 -41
41 lines not on this page · raw message
package/multipath-tools/0004-multipath-tools-Makefile-add-install-dependency.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From ec2b935d2af33651f34de8bd6e428156005c2e3d Mon Sep 17 00:00:00 2001 -From: Martin Wilck <[email protected]> -Date: Tue, 12 May 2020 22:13:51 +0200 -Subject: [PATCH] multipath-tools Makefile: add install dependency - -$(libdir) must exist before running "make install" on prioritizer, checker, -and foreign libraries. - -Cc: Christian Hesse <[email protected]> - -Signed-off-by: Martin Wilck <[email protected]> -Signed-off-by: Alexander Egorenkov <[email protected]> ---- - Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile b/Makefile -index fec3b73b..8bcaba66 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,6 +32,10 @@ libmultipath libdmmp: libmpathcmd - libmpathpersist multipath multipathd: libmultipath - mpathpersist multipathd: libmpathpersist - -+libmultipath/checkers.install \ -+ libmultipath/prioritizers.install \ -+ libmultipath/foreign.install: libmultipath.install -+ - $(BUILDDIRS.clean): - $(MAKE) -C ${@:.clean=} clean - --- -2.28.0 -
package/multipath-tools/multipath-tools.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 ccd73bf67621161d9e42d1a770c3a7efff6e252433e8b8ed5f64a88cb5e7151d multipath-tools-0.8.4.tar.gz +sha256 0549ebe39fd3950ec49c16304da408c2bfe1b18d386d8e6647b5bcb60363c8aa multipath-tools-0.8.5.tar.gz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING
package/multipath-tools/multipath-tools.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.4 -MULTIPATH_TOOLS_SITE = $(call github,openSUSE,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) +MULTIPATH_TOOLS_VERSION = 0.8.5 +MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = LGPL-2.0 MULTIPATH_TOOLS_LICENSE_FILES = COPYING MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf
Signature · 1 line
2.29.2
Thomas Petazzoni
AppliedPATCH 1/1 package/multipath-tools: bump to version 0.8.5
Quoted 4 lines · On Sat, 21 Nov 2020 11:44:12 +0100 Alexander Egorenkov…
Change github URL to https://github.com/opensvc/multipath-tools
which offers proper releases.Signed-off-by Alexander Egorenkov <[email protected]>
Quoted 13 lines
---
...ath-use-pkg-config-to-get-path-to-he.patch | 28 +++++++++----
...le-systemd-if-ENABLE_SYSTEMD-is-def.patch} | 0
...bmpathpersist-depend-on-libmultipath.patch | 31 --------------
...3-fix-boolean-value-with-json-c-0.14.patch | 41 -------------------
...ools-Makefile-add-install-dependency.patch | 34 ---------------
package/multipath-tools/multipath-tools.hash | 2 +-
package/multipath-tools/multipath-tools.mk | 4 +-
7 files changed, 22 insertions(+), 118 deletions(-)
rename package/multipath-tools/{0005-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch => 0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch} (100%)
delete mode 100644 package/multipath-tools/0002-libmpathpersist-depend-on-libmultipath.patch
delete mode 100644 package/multipath-tools/0003-fix-boolean-value-with-json-c-0.14.patch
delete mode 100644 package/multipath-tools/0004-multipath-tools-Makefile-add-install-dependency.patchApplied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com