From 0007d3fe8a19ae21db15450550885549381924282f23f375802817b2d08d67b0 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 20 Mar 2017 12:52:30 +0000 Subject: [PATCH 1/5] Accepting request 478509 from home:mwilck:branches:Base:System - Update to version 0.6.4+103+suse.bcb5d0f4: * changed to official github repo openSUSE/multipath-tools (no changes code-wise) - Spec file: Added dependency on sg3_utils (#boo1028857) - 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 - Update to version 0.6.4+102.df7d367e: * libmultipath/propsel: Do not select sysfs prioritizer for RDAC arrays (bsc#1004858) - 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 OBS-URL: https://build.opensuse.org/request/show/478509 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=114 --- _service | 10 +- _servicedata | 10 +- ...th-tools-0.6.2+suse20160928.8939fb6.tar.xz | 3 - ...ipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz | 3 + multipath-tools.changes | 115 +++++++++++++++++- multipath-tools.spec | 115 ++++++++++++++++-- 6 files changed, 229 insertions(+), 27 deletions(-) delete mode 100644 multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz create mode 100644 multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz diff --git a/_service b/_service index 7034593..d13c1d6 100644 --- a/_service +++ b/_service @@ -1,16 +1,16 @@ - + git https://github.com/openSUSE/multipath-tools.git multipath-tools - 0.6.2+suse%cd.%h - sles12-sp2 + @PARENT_TAG@+@TAG_OFFSET@+suse.%h + bcb5d0f4 enable - + *multipath-tools*.tar xz - + diff --git a/_servicedata b/_servicedata index ad16ad4..f967c57 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ - - https://github.com/openSUSE/multipath-tools.git - c560463067b27825167e63d9f6b52c90751bea98 - - \ No newline at end of file + + https://github.com/mwilck/multipath-tools.git + 0119472d847eaa24cae7a0f3b523af82f50dd4df + https://github.com/openSUSE/multipath-tools.git + 0119472d847eaa24cae7a0f3b523af82f50dd4df \ No newline at end of file diff --git a/multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz b/multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz deleted file mode 100644 index 3958980..0000000 --- a/multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f9d26cb0fff486df4de5a7a260e7689e0d75d00c7cdcfcf85110a44f906cb06 -size 188472 diff --git a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz new file mode 100644 index 0000000..7d0ac1e --- /dev/null +++ b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47e07a9570347301595fbcd5a58a9cece9d08b56eebb1572efaee4fbb7a44174 +size 250004 diff --git a/multipath-tools.changes b/multipath-tools.changes index 895feb8..62a9e34 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,10 +1,123 @@ +------------------------------------------------------------------- +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 diff --git a/multipath-tools.spec b/multipath-tools.spec index bc1efc2..9473c4b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -16,11 +16,62 @@ # -%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 +# Default NO on SLES 12 >= SP2 +# Always NO on other distros +%if 0%{?suse_version} == 1315 +%if 0%{?is_opensuse} == 1 +%bcond_without rados +%else +%if 0%{?sle_version} >= 120200 +%bcond_with rados +%endif +%endif +%else +%if 0%{?suse_version} >= 1330 +%bcond_without rados +%endif +%endif + +# 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 +%bcond_with libdmmp +%endif +%else +%if 0%{?suse_version} >= 1330 +%bcond_without libdmmp +%endif +%endif + +# This should match the version in libdmmp/Makefile +%define _libdmmp_version 0.1.0 +%define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools 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 @@ -30,8 +81,9 @@ 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 +Version: 0.6.4+103+suse.bcb5d0f4 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 @@ -41,11 +93,8 @@ Group: System/Base 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 @@ -80,18 +129,37 @@ Requires: device-mapper 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/Other +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="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} %install -make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} install +make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} 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 +rm $RPM_BUILD_ROOT/%_lib/*.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 @@ -130,9 +198,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 +231,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 From 37931ba301f9d456e36e0da77ce5aa9b3b5e64329ecd8ebc0a76e240d21bb6d8 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 21 Mar 2017 12:21:19 +0000 Subject: [PATCH 2/5] Accepting request 481759 from home:mwilck:branches:Base:System - 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 OBS-URL: https://build.opensuse.org/request/show/481759 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=115 --- _service | 2 +- _servicedata | 2 +- ...ipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz | 3 -- ...ipath-tools-0.6.4+104+suse.ac0df678.tar.xz | 3 ++ multipath-tools.changes | 10 +++++ multipath-tools.spec | 39 ++++++++++++------- 6 files changed, 41 insertions(+), 18 deletions(-) delete mode 100644 multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz create mode 100644 multipath-tools-0.6.4+104+suse.ac0df678.tar.xz diff --git a/_service b/_service index d13c1d6..333df44 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ multipath-tools @PARENT_TAG@+@TAG_OFFSET@+suse.%h - bcb5d0f4 + ac0df678 enable diff --git a/_servicedata b/_servicedata index f967c57..fecd761 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ https://github.com/mwilck/multipath-tools.git 0119472d847eaa24cae7a0f3b523af82f50dd4df https://github.com/openSUSE/multipath-tools.git - 0119472d847eaa24cae7a0f3b523af82f50dd4df \ No newline at end of file + ac0df6786a94cb1178ba263299146a8369f15291 \ No newline at end of file diff --git a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz deleted file mode 100644 index 7d0ac1e..0000000 --- a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47e07a9570347301595fbcd5a58a9cece9d08b56eebb1572efaee4fbb7a44174 -size 250004 diff --git a/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz b/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz new file mode 100644 index 0000000..7d564d0 --- /dev/null +++ b/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d62b785208db0008243565345ebab065da34dbaea51ed8aa23e475577f80d5c2 +size 250568 diff --git a/multipath-tools.changes b/multipath-tools.changes index 62a9e34..2c55ca5 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/multipath-tools.spec b/multipath-tools.spec index 9473c4b..c345792 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -26,22 +26,35 @@ %endif # Whether to build with RADOS support -# Default YES on openSUSE factory and leap +# 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 -%else +%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 ppc64le s390x +%if 0%{?sle_version} >= 120300 +%bcond_without rados +%else # 0%{?sle_version} >= 120300 %if 0%{?sle_version} >= 120200 %bcond_with rados -%endif -%endif -%else +%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 -%endif +%endif # arch +%endif # 0%{?suse_version} >= 1330 +%endif # 0%{?suse_version} == 1315 # Whether to build libdmmp # Default YES on openSUSE factory and leap @@ -50,14 +63,14 @@ %if 0%{?suse_version} == 1315 %if 0%{?is_opensuse} == 1 %bcond_without libdmmp -%else +%else # 0%{?is_opensuse} == 1 %bcond_with libdmmp -%endif -%else +%endif # 0%{?is_opensuse} == 1 +%else # 0%{?is_opensuse} == 1 %if 0%{?suse_version} >= 1330 %bcond_without libdmmp -%endif -%endif +%endif # 0%{?suse_version} >= 1330 +%endif # 0%{?suse_version} == 1315 # This should match the version in libdmmp/Makefile %define _libdmmp_version 0.1.0 @@ -83,7 +96,7 @@ Requires: device-mapper >= 1.2.78 Requires: kpartx Requires: sg3_utils PreReq: coreutils grep -Version: 0.6.4+103+suse.bcb5d0f4 +Version: 0.6.4+104+suse.ac0df678 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 From 9662d3520bc12344fae2a5f305657a5ec2e11b3bef8966d27d4b61b372cd07eb Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 23 Mar 2017 13:37:08 +0000 Subject: [PATCH 3/5] Accepting request 482226 from home:mwilck:branches:Base:System - Downgrade to version 0.6.4+103+suse.bcb5d0f4: * temporarily remove commit "multipathd: fix SIGUSR2 handling" until it's merged in official repo - Enable rados for SLES only for x86_64 and aarch64 (ceph is currently disabled on SLES on s390x and ppc64le) OBS-URL: https://build.opensuse.org/request/show/482226 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=116 --- _service | 2 +- _servicedata | 4 +--- multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz | 3 +++ multipath-tools-0.6.4+104+suse.ac0df678.tar.xz | 3 --- multipath-tools.changes | 9 +++++++++ multipath-tools.spec | 4 ++-- 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz delete mode 100644 multipath-tools-0.6.4+104+suse.ac0df678.tar.xz diff --git a/_service b/_service index 333df44..d13c1d6 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ multipath-tools @PARENT_TAG@+@TAG_OFFSET@+suse.%h - ac0df678 + bcb5d0f4 enable diff --git a/_servicedata b/_servicedata index fecd761..b5e8630 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,4 @@ - https://github.com/mwilck/multipath-tools.git - 0119472d847eaa24cae7a0f3b523af82f50dd4df https://github.com/openSUSE/multipath-tools.git - ac0df6786a94cb1178ba263299146a8369f15291 \ No newline at end of file + 0119472d847eaa24cae7a0f3b523af82f50dd4df \ No newline at end of file diff --git a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz new file mode 100644 index 0000000..1705f2e --- /dev/null +++ b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4475117dc6dc64eaf29eab61cdfbfe78fce0f6a28ce15b81564e433705ccbdd +size 2186572 diff --git a/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz b/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz deleted file mode 100644 index 7d564d0..0000000 --- a/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d62b785208db0008243565345ebab065da34dbaea51ed8aa23e475577f80d5c2 -size 250568 diff --git a/multipath-tools.changes b/multipath-tools.changes index 2c55ca5..b9ac850 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 23 13:23:01 UTC 2017 - mwilck@suse.com + +- Downgrade to version 0.6.4+103+suse.bcb5d0f4: + * temporarily remove commit "multipathd: fix SIGUSR2 handling" + until it's merged in official repo +- Enable rados for SLES only for x86_64 and aarch64 (ceph is currently + disabled on SLES on s390x and ppc64le) + ------------------------------------------------------------------- Tue Mar 21 11:49:06 UTC 2017 - mwilck@suse.com diff --git a/multipath-tools.spec b/multipath-tools.spec index c345792..4faae16 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -37,7 +37,7 @@ %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 ppc64le s390x +%ifarch x86_64 aarch64 %if 0%{?sle_version} >= 120300 %bcond_without rados %else # 0%{?sle_version} >= 120300 @@ -96,7 +96,7 @@ Requires: device-mapper >= 1.2.78 Requires: kpartx Requires: sg3_utils PreReq: coreutils grep -Version: 0.6.4+104+suse.ac0df678 +Version: 0.6.4+103+suse.bcb5d0f4 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 From a3fafa821277849b0c10064dd5a18bb5072800fb99bf93b8d4550e2cd82935fb Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 23 Mar 2017 14:02:10 +0000 Subject: [PATCH 4/5] Accepting request 482261 from home:mwilck:branches:Base:System Previous tarball was unclean causing build failures on non-x86_64. resending it OBS-URL: https://build.opensuse.org/request/show/482261 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=117 --- multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz index 1705f2e..4d14ce6 100644 --- a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz +++ b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4475117dc6dc64eaf29eab61cdfbfe78fce0f6a28ce15b81564e433705ccbdd -size 2186572 +oid sha256:2d01daa86810a1cd807e6d32f7db72fc83c09a31d4899fbe4b4865038ebf690c +size 250716 From a1bf7de56ba6b17c3b6a7733534cfb85ef2f1c6c1124fa3d54d9df8326776b31 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Fri, 24 Mar 2017 15:23:05 +0000 Subject: [PATCH 5/5] Accepting request 482451 from home:mwilck:branches:Base:System Added bugzilla references to satisfy "leaper" BS review bot for SLES. OBS-URL: https://build.opensuse.org/request/show/482451 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=118 --- _service | 6 +++--- multipath-tools.changes | 13 +++++++++--- multipath-tools.spec | 46 ++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/_service b/_service index d13c1d6..b436c75 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + git https://github.com/openSUSE/multipath-tools.git @@ -8,9 +8,9 @@ bcb5d0f4 enable - + *multipath-tools*.tar xz - + diff --git a/multipath-tools.changes b/multipath-tools.changes index b9ac850..3e69130 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,11 +1,18 @@ +------------------------------------------------------------------- +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 -- Enable rados for SLES only for x86_64 and aarch64 (ceph is currently - disabled on SLES on s390x and ppc64le) + until it's merged in official repo (bsc#1030699) ------------------------------------------------------------------- Tue Mar 21 11:49:06 UTC 2017 - mwilck@suse.com diff --git a/multipath-tools.spec b/multipath-tools.spec index 4faae16..b8ed924 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -76,7 +76,20 @@ %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 @@ -91,23 +104,10 @@ 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.4+103+suse.bcb5d0f4 -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 - -%define _sysdir usr/lib %description This package provides the tools to manage multipathed devices by @@ -135,7 +135,7 @@ 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 @@ -153,7 +153,7 @@ 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/Other +Group: Development/Libraries/C and C++ Requires: libdmmp%{libdmmp_version} %description -n libdmmp-devel @@ -167,16 +167,16 @@ This package provides development files and documentation for libdmmp. %setup -q -n multipath-tools-%{version} %build -make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} +make CC="%__cc" OPTFLAGS="%{optflags}" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} %install -make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} install -mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/ -rm $RPM_BUILD_ROOT/%_lib/*.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