From bbffa90c1eb6ceef35fe3efc60cf96a000c2385759cb5b4a17b3cd0c1ccf4e46 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 25 Jan 2023 17:08:22 +0000 Subject: [PATCH] Accepting request 1060999 from home:mwilck:multipath - Update to version 0.9.4+68+suse.98559ea: * libmultipath: bump ABI version to 18.0.0 * libmultipath: pathinfo: don't fail for devices lacking INQUIRY properties (gh#opensvc/multipath-tools#56) * libmpathpersist: use conf->timeout for updating persistent reservations (gh#opensvc/multipath-tools#45) * libmultipath: is_path_valid(): check if device is in use (bsc#1203141) (added libmount dependency) * libmultipath: orphan paths if coalesce_paths frees newmp (bsc#1207546) * multipathd: handle no active paths in update_map_pr (bsc#1207546) * multipathd: make pr registration consistent (bsc#1207546) * libmultipath: don't leak memory on invalid strings (bsc#1207546) * multipath.conf(5): improve documentation of dev_loss_tmo (bsc#1207546) * libmpathpersist: fix command keyword ordering (bsc#1207546) * libmultipath: fix 'show paths format' failure * minor bugfixes * hwtable fixes * Build system rework * spec file: adapt make command line to changes in build system * spec file: use make -Orecurse (better readable output) * spec file: use verbose build OBS-URL: https://build.opensuse.org/request/show/1060999 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=304 --- _servicedata | 2 +- multipath-tools-0.9.2+59+suse.ac8942d.obscpio | 3 --- multipath-tools-0.9.4+68+suse.98559ea.obscpio | 3 +++ multipath-tools.changes | 25 +++++++++++++++++++ multipath-tools.obsinfo | 6 ++--- multipath-tools.spec | 20 +++++++-------- 6 files changed, 41 insertions(+), 18 deletions(-) delete mode 100644 multipath-tools-0.9.2+59+suse.ac8942d.obscpio create mode 100644 multipath-tools-0.9.4+68+suse.98559ea.obscpio diff --git a/_servicedata b/_servicedata index 682a650..5d6687e 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - ac8942d3635fb8e7fcd4d6c046aa699f192e16a6 \ No newline at end of file + 98559ea17f6ec40a8ef63c383f66ad1e00aed0d5 \ No newline at end of file diff --git a/multipath-tools-0.9.2+59+suse.ac8942d.obscpio b/multipath-tools-0.9.2+59+suse.ac8942d.obscpio deleted file mode 100644 index ae67b2a..0000000 --- a/multipath-tools-0.9.2+59+suse.ac8942d.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad661cb10628d417cb1393b6438e0a919521f276691adf74a14c162b199e5612 -size 2761740 diff --git a/multipath-tools-0.9.4+68+suse.98559ea.obscpio b/multipath-tools-0.9.4+68+suse.98559ea.obscpio new file mode 100644 index 0000000..60e253b --- /dev/null +++ b/multipath-tools-0.9.4+68+suse.98559ea.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90e1505cd8b59a5720f85e755de5f61916ebe0bcd07fe5daf38255c92baba1aa +size 2781196 diff --git a/multipath-tools.changes b/multipath-tools.changes index 2009758..34dc60c 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Jan 25 15:04:40 UTC 2023 - Martin Wilck + +- Update to version 0.9.4+68+suse.98559ea: + * libmultipath: bump ABI version to 18.0.0 + * libmultipath: pathinfo: don't fail for devices lacking INQUIRY properties + (gh#opensvc/multipath-tools#56) + * libmpathpersist: use conf->timeout for updating persistent reservations + (gh#opensvc/multipath-tools#45) + * libmultipath: is_path_valid(): check if device is in use + (bsc#1203141) (added libmount dependency) + * libmultipath: orphan paths if coalesce_paths frees newmp (bsc#1207546) + * multipathd: handle no active paths in update_map_pr (bsc#1207546) + * multipathd: make pr registration consistent (bsc#1207546) + * libmultipath: don't leak memory on invalid strings (bsc#1207546) + * multipath.conf(5): improve documentation of dev_loss_tmo (bsc#1207546) + * libmpathpersist: fix command keyword ordering (bsc#1207546) + * libmultipath: fix 'show paths format' failure + * minor bugfixes + * hwtable fixes + * Build system rework + * spec file: adapt make command line to changes in build system + * spec file: use make -Orecurse (better readable output) + * spec file: use verbose build + ------------------------------------------------------------------- Wed Jan 18 09:27:06 UTC 2023 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index 0a2501c..a0f8955 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.2+59+suse.ac8942d -mtime: 1666765617 -commit: ac8942d3635fb8e7fcd4d6c046aa699f192e16a6 +version: 0.9.4+68+suse.98559ea +mtime: 1674658685 +commit: 98559ea17f6ec40a8ef63c383f66ad1e00aed0d5 diff --git a/multipath-tools.spec b/multipath-tools.spec index 414d3e2..497f1a6 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ # # spec file for package multipath-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ %global _lto_cflags %{nil} +%global _make_output_sync -Orecurse # multipath-tools auto-detects support for -D_FORTFY_SOURCE. # This will lead to a compilation error if the distro overrides @@ -34,7 +35,7 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.2+59+suse.ac8942d +Version: 0.9.4+68+suse.98559ea Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later @@ -62,6 +63,7 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(liburcu) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) +BuildRequires: pkgconfig(mount) %if 0%{?with_check} == 1 BuildRequires: pkgconfig(cmocka) %endif @@ -88,10 +90,6 @@ 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 @@ -153,11 +151,11 @@ This package provides development files and documentation for libdmmp. %define makeflags %{!?with_libdmmp:ENABLE_LIBDMMP=0} %if 0%{?suse_version} < 1550 -%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} SYSTEMDPATH=usr/lib +%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} systemd_prefix=%{_prefix} %define sbindir /sbin %define libdir /%{_lib} %else -%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} exec_prefix=%{_prefix} syslibdir=%{_libdir} libdir=%{_libdir}/multipath SYSTEMDPATH=usr/lib +%define dirflags LIB=%{_lib} prefix=%{_prefix} %define sbindir %{_sbindir} %define libdir %{_libdir} %endif @@ -170,15 +168,15 @@ cp %{SOURCE5} . %build [ -n "$SOURCE_DATE_EPOCH" ] && export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH -%{make_build} OPTFLAGS="%{mp_optflags}" %{dirflags} %{makeflags} +%{make_build} OPTFLAGS="%{mp_optflags}" %{dirflags} %{makeflags} V=1 %if 0%{?with_check} == 1 %check -%{make_build} OPTFLAGS="%{mp_optflags}" test +%{make_build} OPTFLAGS="%{mp_optflags}" V=1 test %endif %install -%make_install %{dirflags} %{makeflags} +%make_install %{dirflags} %{makeflags} V=1 mkdir -p %{buildroot}%{_defaultlicensedir} mkdir -p %{buildroot}/usr/sbin mkdir -p %{buildroot}/usr/%{_lib}