rpm/multipath-tools
SHA256
1
0
Fork 0
forked from pool/multipath-tools
Code Pull Requests Activity

Accepting request 482531 from Base:System

Browse Source 
Added bugzilla references to satisfy "leaper" BS review bot for SLES. (forwarded request 482451 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/482531
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=85
This commit is contained in:
Yuchen Lin 2017-04-07 12:18:04 +00:00 committed by Git OBS Bridge
commit 488fec1841
6 changed files with 280 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -4,8 +4,8 @@
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="subdir"></param>
<param name="filename">multipath-tools</param>
<param name="versionformat">0.6.2+suse%cd.%h</param>
<param name="revision">sles12-sp2</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+suse.%h</param>
<param name="revision">bcb5d0f4</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">

8
_servicedata
View File

@ -1,6 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="changesrevision">c560463067b27825167e63d9f6b52c90751bea98</param>
</service>
</servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="changesrevision">0119472d847eaa24cae7a0f3b523af82f50dd4df</param></service></servicedata>

3
multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f9d26cb0fff486df4de5a7a260e7689e0d75d00c7cdcfcf85110a44f906cb06
size 188472

3
multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d01daa86810a1cd807e6d32f7db72fc83c09a31d4899fbe4b4865038ebf690c
size 250716

141
multipath-tools.changes
View File

@ -1,10 +1,149 @@
-------------------------------------------------------------------
Fri Mar 24 09:59:17 UTC 2017 - mwilck@suse.com
- spec file changes suggested by factory review team (bsc#1030699)
* RPM group adjustments.
* Avoid %__ macro indirections
-------------------------------------------------------------------
Thu Mar 23 13:23:01 UTC 2017 - mwilck@suse.com
- Enable rados for SLES only for x86_64 and aarch64 (ceph is currently
disabled on SLES on s390x and ppc64le) (bsc#1030699)
- Downgrade to version 0.6.4+103+suse.bcb5d0f4:
* temporarily remove commit "multipathd: fix SIGUSR2 handling"
until it's merged in official repo (bsc#1030699)
-------------------------------------------------------------------
Tue Mar 21 11:49:06 UTC 2017 - mwilck@suse.com
- Spec file: disable librados for architectures for which ceph
is not built
- Spec file: enable librados by default for SLES12 SP3, disable
it on Leap <= 42.1
- Update to version 0.6.4+104+suse.ac0df678:
* multipathd: fix SIGUSR2 handling
-------------------------------------------------------------------
Fri Mar 10 13:04:05 UTC 2017 - mwilck@suse.com
- Update to version 0.6.4+103+suse.bcb5d0f4:
* changed to official github repo openSUSE/multipath-tools
(no changes code-wise)
-------------------------------------------------------------------
Fri Mar 10 11:23:40 UTC 2017 - mwilck@suse.com
- Spec file: Added dependency on sg3_utils (#boo1028857)
-------------------------------------------------------------------
Wed Mar 01 15:43:09 UTC 2017 - mwilck@suse.com
- spec file changes: optional librados and libdmmp support
* enabled by default on Factory and Leap
(disable with --without-rados, --without-libdmmp)
* disabled by default on SLES12
(enable with --with-rados, --with-libdmmp)
* libdmmp0_1_0 and libdmmp-devel as separate packages
* minor fixes for RPMLINT warnings
- Update to version 0.6.4+102.0119472d:
* rebased, code-wise identical to previous checkout
-------------------------------------------------------------------
Tue Feb 28 11:26:01 UTC 2017 - mwilck@suse.com
- Update to version 0.6.4+102.df7d367e:
* libmultipath/propsel: Do not select sysfs prioritizer for RDAC arrays
(bsc#1004858)
-------------------------------------------------------------------
Tue Feb 28 10:29:31 UTC 2017 - mwilck@suse.com
- Update to version 0.6.4+101.f01ef4da (SLES12 SP2 changes wrt upstream):
* Make libdmmp build optional
* multipath.rules: use -i flag to multipath
* kpartx: create symlinks for dmraid devices
* kpartx: Add udev compability rules for SUSE
* libmultipath/checkers: make RADOS checker optional
* multipathd: fixup check for new path states (bsc#1019798)
* tur: Add pthread_testcancel() (bsc#101979)
* kpartx: sanitize delete partitions (bsc#100869)
* libmultipath: coalesce_paths: trigger uevent if nothing done
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: differentiate ACT_NOTHING and ACT_IMPOSSIBLE
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: reload map if not known to udev
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: sysfs_attr_set_value: use const char*
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: select_action: check special features separately
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: disassemble_map: treat aminio like assemble_map does
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: disassemble_map: skip no_path_retry check
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: setup_feature: handle "retain_attached_hw_handler"
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: setup_feature: print log msg if no_path_retry cant be set
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* libmultipath: setup_features: log msg if queue_if_no_path is ignored
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* multipathd: use weaker "force_reload" at startup
(bsc#998906, bsc#998893, bsc#1005763, bsc#1011400)
* multipathd: imply -n if find_multipaths is set (bsc#1012910)
* multipath: ignore -i if find_multipaths is set (bsc#1012910)
* libmultipath: move suspend logic to _dm_flush_map (bsc#986838)
* multipath -ll: set DI_SERIAL (bsc#991432)
* libmultipath: use existing alias from bindings file (bsc#1005255)
* libmultipath/discovery: do not cache 'access_state' sysfs attribute (bsc#1004858)
* multipathd: issue systemd READY after initial configuration (bsc#1006469)
* multipath: avoid crash when using modified configuration (bsc#1000914)
* multipathd: Set CLI timeout correctly (bsc#999061)
* libmultipath: Do not crash on empty features (bsc#994812)
* libmultipath: fall back to search paths by devt (bsc#995645)
* multipathd: set timeout for CLI commands correctly (bsc#999061)
* Invalid error code when using multipathd CLI
* multipath: do not check daemon from udev rules (bsc#986734)
* Add support for "multipath=off" and "nompath" on kernel cmdline
* multipathd: start daemon after udev trigger (bsc#98673)
* multipathd.service: fixup Wants= and Before= statements (bsc#1019181, bsc#991742, bsc#986734)
- Update to current upstream (0.6.4-65-ga2675025)
* Avoid that reloading a map sporadically triggers I/O errors
* fix udev rules for failed multipath devices
* multipathd: allow resetting stats
* multipathd: add messages on delayed path addition
* multipathd: don't update priority of failed paths
* libmultipath: cleanup orphan device states
* libmultipath: add detect_checker option
* kpartx: don't keep creating recursive partitions
* multipath-tools: Introducing multipath C API
* multipath-tools: sync valgrind.h with 3.12 upstream
* multipath-tools: add availability of service-time and queue-length to multipath.conf.5
* multipath-tools: add availability of service-time and queue-length to multipath.conf.5
* Fill NVMe specific path info
* Don't blacklist nvme
* multipath-tools: fix misspellings
* multipath-tools: git should ignore rej and orig files
* Include sys/sysmacros.h
* Tolerate modprobe failures in multipathd.service
* multipath-tools: Remove trailing and leading whitespaces
* multipath-tools: Perform socket client uid check on IPC commands.
* multipath-tools: Set errno mpath_recv_reply() when failure
* multipath-tools: New way to limit the IPC command length.
* multipath-tools: libmultipath: Removed unused functions.
* multipath-tools: libmultipath: fix gcc link failure on rcu_register_thread_mb.
* multipath-tools: multipathd: Fix memory leak on load_config().
* [multipathd] Remove trailing whitespaces
* multipathd: deterministic io throughput in multipath
-------------------------------------------------------------------
Sat Feb 18 22:04:25 UTC 2017 - kukuk@suse.com
- Remove superfluous PreReq for insserv and fillup
-------------------------------------------------------------------
Thu Sep 29 06:04:00 UTC 2016 - opensuse-packaging@opensuse.org
Thu Sep 29 06:04:00 UTC 2016 - mwilck@suse.com
- Update to version 0.6.2+suse20160928.8939fb6

162
multipath-tools.spec
View File

@ -16,36 +16,98 @@
#
%define version_unconverted 0.6.2+suse20160928.8939fb6
# Workaround for Leap 42.1 bug, bsc#940315
%if 0%{?suse_version} == 1315
%if 0%{?is_opensuse} == 1
%if 0%{?sle_version} == 0
%define sle_version 120100
%endif
%endif
%endif
# Whether to build with RADOS support
# Default YES on openSUSE factory and leap >= 42.2 and SLES12 >= SP3
# (but only on architectures for which ceph is enabled).
# Default NO on SLES 12 >= SP2
# Always NO on other distros
%if 0%{?suse_version} == 1315
%if 0%{?is_opensuse} == 1
%if 0%{?sle_version} >= 120200
%bcond_without rados
%endif # 0%{?sle_version} >= 120200
%else # 0%{?is_opensuse} == 1
# Only architectures for which ceph is built, see ceph spec file
%ifarch x86_64 aarch64
%if 0%{?sle_version} >= 120300
%bcond_without rados
%else # 0%{?sle_version} >= 120300
%if 0%{?sle_version} >= 120200
%bcond_with rados
%endif # 0%{?sle_version} >= 120200
%endif # 0%{?sle_version} >= 120300
%endif # arch
%endif # 0%{?is_opensuse} == 1
%else # 0%{?suse_version} == 1315
%if 0%{?suse_version} >= 1330
# Only architectures for which ceph is built, see ceph spec file
%ifarch x86_64 aarch64 ppc64 ppc64le
%bcond_without rados
%endif # arch
%endif # 0%{?suse_version} >= 1330
%endif # 0%{?suse_version} == 1315
# Whether to build libdmmp
# Default YES on openSUSE factory and leap
# Default NO on SLES 12
# Always NO on other distros
%if 0%{?suse_version} == 1315
%if 0%{?is_opensuse} == 1
%bcond_without libdmmp
%else # 0%{?is_opensuse} == 1
%bcond_with libdmmp
%endif # 0%{?is_opensuse} == 1
%else # 0%{?is_opensuse} == 1
%if 0%{?suse_version} >= 1330
%bcond_without libdmmp
%endif # 0%{?suse_version} >= 1330
%endif # 0%{?suse_version} == 1315
# This should match the version in libdmmp/Makefile
%define _libdmmp_version 0.1.0
%define libdmmp_version %(echo %{_libdmmp_version} | tr . _)
# path prefix for systemd unit files and udev rules
%define _sysdir usr/lib
Name: multipath-tools
Url: http://christophe.varoqui.free.fr/
Version: 0.6.4+103+suse.bcb5d0f4
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0
Group: System/Base
Source: multipath-tools-%{version}.tar.xz
Source1: multipath.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
BuildRequires: device-mapper-devel
BuildRequires: libaio-devel
%if 0%{?with_rados} == 1
BuildRequires: librados-devel
%endif
%if 0%{?with_libdmmp} == 1
BuildRequires: libjson-c-devel
%endif
BuildRequires: libudev-devel
BuildRequires: liburcu-devel
BuildRequires: readline-devel
BuildRequires: udev
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
Url: http://christophe.varoqui.free.fr/
Requires: device-mapper >= 1.2.78
Requires: kpartx
Requires: sg3_utils
PreReq: coreutils grep
Version: 0.6.2+suse20160928.8939fb6
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0
Group: System/Base
%{?systemd_requires}
%define has_systemd 1
Source: multipath-tools-%{version}.tar.xz
Source1: multipath.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1220
%define _sysdir usr/lib
%else
%define _sysdir lib
%endif
%description
This package provides the tools to manage multipathed devices by
@ -73,29 +135,48 @@ makes multipath maps partionable.
%package devel
Summary: Development libraries for multipath-tools
Group: Development/Libraries/Other
Group: Development/Libraries/C and C++
Requires: device-mapper
%description devel
This package contains the development libraries for multipath-tools
and libmpath_persist.
%if 0%{?with_libdmmp} == 1
%package -n libdmmp%{libdmmp_version}
Summary: C API for multipath-tools
Group: System/Libraries
Requires: multipath-tools
%description -n libdmmp%{libdmmp_version}
This library enables the use of libmultipath commands from C code.
%package -n libdmmp-devel
Summary: Header files for multipath-tools C API
Group: Development/Libraries/C and C++
Requires: libdmmp%{libdmmp_version}
%description -n libdmmp-devel
This package provides development files and documentation for libdmmp.
%endif
%define makeflags %{!?with_rados:ENABLE_RADOS=0} %{!?with_libdmmp:ENABLE_LIBDMMP=0}
%prep
%setup -q -n multipath-tools-%{version}
%build
make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir}
make CC="%__cc" OPTFLAGS="%{optflags}" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags}
%install
make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} install
mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
rm $RPM_BUILD_ROOT/%_lib/libmpathcmd.so
rm $RPM_BUILD_ROOT/%_lib/libmultipath.so
mkdir -p $RPM_BUILD_ROOT/usr/sbin
ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd
mkdir -p $RPM_BUILD_ROOT/usr/lib/modules-load.d
install -m 644 -D %{SOURCE1} "%buildroot/usr/lib/modules-load.d/multipath.conf"
make DESTDIR=%{buildroot} LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} install
mkdir -p %{buildroot}/var/cache/multipath/
rm %{buildroot}/%_lib/*.so
mkdir -p %{buildroot}/usr/sbin
ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcmultipathd
mkdir -p %{buildroot}/usr/lib/modules-load.d
install -m 644 -D %{SOURCE1} "%{buildroot}/usr/lib/modules-load.d/multipath.conf"
%pre
[ -f /.buildenv ] && exit 0
@ -130,9 +211,10 @@ exit 0
%files
%defattr(-,root,root)
%doc COPYING README ChangeLog
%doc COPYING README
%{_udevrulesdir}/11-dm-mpath.rules
%{_udevrulesdir}/56-multipath.rules
%{_udevrulesdir}/67-kpartx-compat.rules
/%{_lib}/libmultipath.so.0
/%{_lib}/libmpathcmd.so.0
/%{_lib}/libmpathpersist.so.0
@ -162,8 +244,28 @@ exit 0
%defattr(-,root,root)
/sbin/kpartx
%{_udevrulesdir}/66-kpartx.rules
%{_udevrulesdir}/67-kpartx-compat.rules
/%{_sysdir}/udev/kpartx_id
%{_mandir}/man8/kpartx.8*
%if 0%{?with_libdmmp} == 1
%post -n libdmmp%{libdmmp_version}
%{run_ldconfig}
%postun -n libdmmp%{libdmmp_version}
%{run_ldconfig}
%files -n libdmmp%{libdmmp_version}
%defattr(-,root,root)
/%{_lib}/libdmmp.so.%{_libdmmp_version}
%files -n libdmmp-devel
%defattr(-,root,root)
%{_mandir}/man3/libdmmp.h*
%{_mandir}/man3/dmmp_*
%{_includedir}/libdmmp
%{_datadir}/pkgconfig/libdmmp.pc
%endif # with_libdmmp
%changelog