From b3f38e5d37447339b69b5e82aae5f2e35ee4edec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Jun 2022 23:36:12 +0200 Subject: [PATCH] package/multipath-tools: bump to version 0.9.0 - Renumber patch - Update hash of README.md (changes not related to license) - FPIN support is fixed by setting LINUX_HEADERS_INCDIR and https://github.com/opensvc/multipath-tools/commit/63aa47d0327de2beacf86f6a8e2fd7575d62dadf FPIN support is (wrongly) enabled if ELS_DTAG_LNK_INTEGRITY is defined in /usr/include/scsi/fc/fc_els.h since bump to version 0.8.9 in commit b790ff27d5461df4de22732611a1eb4beee68f91 and https://github.com/opensvc/multipath-tools/commit/cfff03efbca753ef485ad717087464dced9c721a resulting in the following build failure: In file included from /nvmedata/autobuild/instance-7/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/include/scsi/scsi_netlink_fc.h:25, from fpin_handlers.c:6: /nvmedata/autobuild/instance-7/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/include/scsi/scsi_netlink.h:44:2: error: unknown type name 'uint8_t' 44 | uint8_t version; | ^~~~~~~ https://github.com/opensvc/multipath-tools/compare/0.8.9...0.9.0 Fixes: - http://autobuild.buildroot.org/results/32f4ada6c49261924ca78f62dee43241bda379a3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4246d5055946b4e4c503fe69b5eab95fc6069b56) Signed-off-by: Peter Korsgaard --- ...akefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch} | 0 package/multipath-tools/multipath-tools.hash | 4 ++-- package/multipath-tools/multipath-tools.mk | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename package/multipath-tools/{0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch => 0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch} (100%) diff --git a/package/multipath-tools/0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch b/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch similarity index 100% rename from package/multipath-tools/0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch rename to package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 58d8de369c..df0d24fb74 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 27a426facea0474e6dc48e026a94f7c86890d3f27b439b07ec26b0b9887b0cc4 multipath-tools-0.8.9.tar.gz +sha256 d6d1d819a53d076a91828ede42d9786451a471c4b71ca3fd25d04ad5413e3f95 multipath-tools-0.9.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 a3777a6b4433a23246eed8a88ca8466e3d21a2f758c03d060201fe2c44ff5484 README.md +sha256 fb0a5d2008c609fec129d2ffd01dd7f65f0e3868bcf465b6fda76e25ff896ce9 README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index c0b7c5721e..f3ce3ca8b8 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.9 +MULTIPATH_TOOLS_VERSION = 0.9.0 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ @@ -21,6 +21,7 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ + LINUX_HEADERS_INCDIR=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \