From 3a861871a7d51f113a9da20dc263658588d35eea6eda4a8eaa8a75016826b1d8 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 25 Oct 2023 11:02:55 +0000 Subject: [PATCH] Accepting request 1120227 from home:mwilck:multipath - Update to version 0.9.6+115+suse.07776fb * multipathd: Added support to handle FPIN-Li events for FC-NVMe - Update to version 0.9.6+110+suse.5dfdf35: * The options "bindings_file", "prkeys_file", and "wwids_file", which have been deprecated since multipath-tools 0.8.8, aren't supported any more. The paths to these files are now hard-coded to "bindings", "prkeys" and "wwids" under /etc/multipath. * Strictly avoid assigning map aliases that are already taken (bsc#1213265) * Improve handling of user-friendly names * avoid "multipath -d" (dry-run) changing SCSI timeouts in sysfs (bsc#1213809) - spec file: * adapt prefix values to upstream changes * fix compilation flags for "make check" * pass EXTRAVERSION to build OBS-URL: https://build.opensuse.org/request/show/1120227 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=318 --- _servicedata | 2 +- ...ipath-tools-0.9.6+115+suse.07776fb.obscpio | 3 +++ multipath-tools-0.9.6+71+suse.f07325e.obscpio | 3 --- multipath-tools.changes | 25 +++++++++++++++++++ multipath-tools.obsinfo | 6 ++--- multipath-tools.spec | 19 +++++++------- 6 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 multipath-tools-0.9.6+115+suse.07776fb.obscpio delete mode 100644 multipath-tools-0.9.6+71+suse.f07325e.obscpio diff --git a/_servicedata b/_servicedata index d8304a5..b99ff2c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - f07325e85d5d9444ac4c816f75d2ce67af52af93 \ No newline at end of file + 07776fbb60471c83dda3f463d3c02cc67a921aef \ No newline at end of file diff --git a/multipath-tools-0.9.6+115+suse.07776fb.obscpio b/multipath-tools-0.9.6+115+suse.07776fb.obscpio new file mode 100644 index 0000000..9a6f172 --- /dev/null +++ b/multipath-tools-0.9.6+115+suse.07776fb.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e587a3565cd564cbf2b21aa8c2aad330601e618d82dcd9bb1c85dc0d87008c17 +size 2833420 diff --git a/multipath-tools-0.9.6+71+suse.f07325e.obscpio b/multipath-tools-0.9.6+71+suse.f07325e.obscpio deleted file mode 100644 index 96c8143..0000000 --- a/multipath-tools-0.9.6+71+suse.f07325e.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29b31f59ce21e3dc530d9ae44ffbeac787c486ffc2ffa8f40aebda8a738c47f2 -size 2795532 diff --git a/multipath-tools.changes b/multipath-tools.changes index a1e1b87..5dd9ba8 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Oct 25 10:46:30 UTC 2023 - Martin Wilck + +- Update to version 0.9.6+115+suse.07776fb + * multipathd: Added support to handle FPIN-Li events for FC-NVMe + +------------------------------------------------------------------- +Fri Sep 15 12:36:30 UTC 2023 - Martin Wilck + +- Update to version 0.9.6+110+suse.5dfdf35: + * The options "bindings_file", "prkeys_file", and "wwids_file", + which have been deprecated since multipath-tools 0.8.8, + aren't supported any more. The paths to these files are now + hard-coded to "bindings", "prkeys" and "wwids" under + /etc/multipath. + * Strictly avoid assigning map aliases that are already taken + (bsc#1213265) + * Improve handling of user-friendly names + * avoid "multipath -d" (dry-run) changing SCSI timeouts in sysfs + (bsc#1213809) +- spec file: + * adapt prefix values to upstream changes + * fix compilation flags for "make check" + * pass EXTRAVERSION to build + ------------------------------------------------------------------- Tue Sep 12 06:48:40 UTC 2023 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index dfe78f3..3f26baf 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.6+71+suse.f07325e -mtime: 1694069633 -commit: f07325e85d5d9444ac4c816f75d2ce67af52af93 +version: 0.9.6+115+suse.07776fb +mtime: 1698230447 +commit: 07776fbb60471c83dda3f463d3c02cc67a921aef diff --git a/multipath-tools.spec b/multipath-tools.spec index 8eff2ec..899301d 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -21,8 +21,8 @@ # multipath-tools auto-detects support for -D_FORTFY_SOURCE. # This will lead to a compilation error if the distro overrides -# -D_FORTIFY_SOURCE in optflags, unless we precede it with -U -%global mp_optflags %(echo %{optflags} | sed 's/-D_FORTIFY_SOURCE=[0-9]/-U_FORTIFY_SOURCE &/') +# -D_FORTIFY_SOURCE in optflags, unless it's preceded with -U_FORTIFY_SOURCE +%global mp_optflags %(echo %{optflags} | sed '/-U_FORTIFY_SOURCE/!s/-D_FORTIFY_SOURCE=[0-9]/-U_FORTIFY_SOURCE &/') # Whether to build libdmmp - default YES %bcond_without libdmmp @@ -35,7 +35,7 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.6+71+suse.f07325e +Version: 0.9.6+115+suse.07776fb Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later @@ -87,9 +87,6 @@ monitors path devices for failure, removal, or addition, and applies the necessary changes to the multipath maps to ensure continuous availability of the map devices. - - - # Currently, it makes no sense to split out libmpathpersist and libmpathcmd # separately. libmultipath has no stable API at all, and it depends # on libmpathcmd (to be fixed). libmpathpersist depends on libmultipath @@ -149,17 +146,19 @@ Requires: libdmmp%{libdmmp_version} = %{version} %description -n libdmmp-devel This package provides development files and documentation for libdmmp. -%define makeflags %{!?with_libdmmp:ENABLE_LIBDMMP=0} +%global extraversion %(echo %{version} | sed 's/^[^+]*//') +%define makeflags EXTRAVERSION="%{extraversion}" %{!?with_libdmmp:ENABLE_LIBDMMP=0} %if 0%{?suse_version} < 1550 -%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} systemd_prefix=%{_prefix} +%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} %define sbindir /sbin %define libdir /%{_lib} %else -%define dirflags LIB=%{_lib} prefix=%{_prefix} configdir=%{_sysconfdir}/multipath/conf.d +%define dirflags LIB=%{_lib} prefix=%{_prefix} etc_prefix= %define sbindir %{_sbindir} %define libdir %{_libdir} %endif + %prep %setup -q -n multipath-tools-%{version} cp %{SOURCE4} . @@ -172,7 +171,7 @@ cp %{SOURCE5} . %if 0%{?with_check} == 1 %check -%{make_build} OPTFLAGS="%{mp_optflags}" V=1 test +%{make_build} OPTFLAGS="%{mp_optflags}" %{dirflags} %{makeflags} V=1 test %endif %install