From 7e3c14290096c32d1a3869810cba6d11e23d21fdd903f45c9522c982dd2e1989 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Fri, 28 Apr 2017 09:13:05 +0000 Subject: [PATCH] Accepting request 491762 from home:mwilck:branches:Base:System --------------------------------------------------------------------- - spec file: Disable RADOS support for i586 on Leap 42.x (bsc#1036271) - spec file: Move libdmmp to /usr/lib[64] (bsc#1036652) - Update to version 0.7.1+7+suse.3edc5f7d: * kpartx: use mapname if no uuid is present (bsc#1033541) * kpartx: relax check when checking for a kpartx device (bsc#1033541) * libmpathpersist: use extern struct udev (bsc#1027188) * kpartx: include sys/sysmacros.h (fix compilation warning) - Update to upstream version 0.7.1: * multipath-tools: improve processing efficiency for addition and deletion of multipath devices * uevent_can_discard: optimize devpath check * multipathd: fix SIGUSR2 handling * multipath-tools: clean up libdmmp/Makefile * multipath-tools: libdmmp: Fix incorrect use of __attribute__ * multipath-tools: Remove trailing whitespaces * multipath-tools: add missing "-l" flag for pthread in libdmmp/Makefile * multipath-tools: build objects for libdmmp and libmpathpersist independently * libdmmp: minor Makefile cleanup * multipath-tools: remove incdir from Makefiles * libdmmp: don't disconnect from multipathd twice * multipathd: don't call strlen on NULL variables * libdmmp: move libdmmp.pc install location * multipathd: drop lock before calling uev_add_path * multipathd: allow devices to switch from RW to RO * libmultipath: don't set max_sectors_kb on reloads * Remove a trailing tab * multipath: fix segfault with disable_changed_wwids * multipath-tools: amend text from multipath/multipath.conf.5 * Bump the version code and date * multipath-tools: replace multipath configuration output OBS-URL: https://build.opensuse.org/request/show/491762 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=120 --- _service | 2 +- _servicedata | 2 +- ...ipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz | 3 -- multipath-tools-0.7.1+7+suse.3edc5f7d.tar.xz | 3 ++ multipath-tools.changes | 36 +++++++++++++++++++ multipath-tools.spec | 26 +++++++++++--- 6 files changed, 62 insertions(+), 10 deletions(-) delete mode 100644 multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz create mode 100644 multipath-tools-0.7.1+7+suse.3edc5f7d.tar.xz diff --git a/_service b/_service index b436c75..121ac2c 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ multipath-tools @PARENT_TAG@+@TAG_OFFSET@+suse.%h - bcb5d0f4 + 3edc5f7dfd7 enable diff --git a/_servicedata b/_servicedata index b5e8630..771d264 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - 0119472d847eaa24cae7a0f3b523af82f50dd4df \ No newline at end of file + 3edc5f7dfd7ef6c2b7fbd5c6b9cf66b915334491 \ 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 4d14ce6..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:2d01daa86810a1cd807e6d32f7db72fc83c09a31d4899fbe4b4865038ebf690c -size 250716 diff --git a/multipath-tools-0.7.1+7+suse.3edc5f7d.tar.xz b/multipath-tools-0.7.1+7+suse.3edc5f7d.tar.xz new file mode 100644 index 0000000..9d0c6fb --- /dev/null +++ b/multipath-tools-0.7.1+7+suse.3edc5f7d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12776103b6f1c4a442c11181bc9e7dc69f38510244119c688a52d3c5876f0dc6 +size 252100 diff --git a/multipath-tools.changes b/multipath-tools.changes index 3e69130..08256f6 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,39 @@ +--------------------------------------------------------------------- +Thu Apr 27 18:15:26 UTC 2017 - mwilck@suse.com + +- spec file: Disable RADOS support for i586 on Leap 42.x (bsc#1036271) +- spec file: Move libdmmp to /usr/lib[64] (bsc#1036652) +- Update to version 0.7.1+7+suse.3edc5f7d: + * kpartx: use mapname if no uuid is present (bsc#1033541) + * kpartx: relax check when checking for a kpartx device (bsc#1033541) + * libmpathpersist: use extern struct udev (bsc#1027188) + * kpartx: include sys/sysmacros.h (fix compilation warning) +- Update to upstream version 0.7.1: + * multipath-tools: improve processing efficiency for addition and deletion of multipath devices + * uevent_can_discard: optimize devpath check + * multipathd: fix SIGUSR2 handling + * multipath-tools: clean up libdmmp/Makefile + * multipath-tools: libdmmp: Fix incorrect use of __attribute__ + * multipath-tools: Remove trailing whitespaces + * multipath-tools: add missing "-l" flag for pthread in libdmmp/Makefile + * multipath-tools: build objects for libdmmp and libmpathpersist independently + * libdmmp: minor Makefile cleanup + * multipath-tools: remove incdir from Makefiles + * libdmmp: don't disconnect from multipathd twice + * multipathd: don't call strlen on NULL variables + * libdmmp: move libdmmp.pc install location + * multipathd: drop lock before calling uev_add_path + * multipathd: allow devices to switch from RW to RO + * libmultipath: don't set max_sectors_kb on reloads + * Remove a trailing tab + * multipath: fix segfault with disable_changed_wwids + * multipath-tools: amend text from multipath/multipath.conf.5 + * Bump the version code and date + * multipath-tools: replace multipath configuration output + * Revert "multipathd: set timeout for CLI commands correctly" + * libmultipath: fix skip_kpartx support for removing maps + * Bump version to 0.7.1 + ------------------------------------------------------------------- Fri Mar 24 09:59:17 UTC 2017 - mwilck@suse.com diff --git a/multipath-tools.spec b/multipath-tools.spec index b8ed924..8f221b7 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -30,17 +30,24 @@ # (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 +#### Leap 42.x: Support from 42.2 on, for ceph-supported archs +#### (see ExclusiveArch in ceph spec file) +%ifarch x86_64 aarch64 ppc64 ppc64le %if 0%{?sle_version} >= 120200 %bcond_without rados %endif # 0%{?sle_version} >= 120200 +%endif # arch %else # 0%{?is_opensuse} == 1 -# Only architectures for which ceph is built, see ceph spec file +#### SLE12: Support from SP3 on, for ceph-supported archs +#### (see ExclusiveArch in ceph spec file *on IBS*) %ifarch x86_64 aarch64 %if 0%{?sle_version} >= 120300 %bcond_without rados %else # 0%{?sle_version} >= 120300 +#### SLE12 SP2: rados can be enabled here using --with rados %if 0%{?sle_version} >= 120200 %bcond_with rados %endif # 0%{?sle_version} >= 120200 @@ -49,7 +56,8 @@ %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 +#### Factory / Tumbleweed +#### (see ExclusiveArch in ceph spec file) %ifarch x86_64 aarch64 ppc64 ppc64le %bcond_without rados %endif # arch @@ -81,7 +89,7 @@ Name: multipath-tools Url: http://christophe.varoqui.free.fr/ -Version: 0.6.4+103+suse.bcb5d0f4 +Version: 0.7.1+7+suse.3edc5f7d Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 @@ -178,6 +186,14 @@ 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" +%if 0%{?with_libdmmp} == 1 +## libdmmp doesnt need to be under /lib[64] +mkdir -p %{buildroot}/%{_libdir}/pkgconfig +mv -f %{buildroot}/%{_lib}/libdmmp.so.%{_libdmmp_version} %{buildroot}/%{_libdir} +mv -f %{buildroot}/%{_lib}/pkgconfig/libdmmp.pc %{buildroot}/%{_libdir}/pkgconfig +rmdir %{buildroot}/%{_lib}/pkgconfig +%endif + %pre [ -f /.buildenv ] && exit 0 if [ -f /etc/init.d/multipathd ] && dmsetup --target multipath table | grep -q multipath ; then @@ -257,14 +273,14 @@ exit 0 %files -n libdmmp%{libdmmp_version} %defattr(-,root,root) -/%{_lib}/libdmmp.so.%{_libdmmp_version} +/%{_libdir}/libdmmp.so.%{_libdmmp_version} %files -n libdmmp-devel %defattr(-,root,root) %{_mandir}/man3/libdmmp.h* %{_mandir}/man3/dmmp_* %{_includedir}/libdmmp -%{_datadir}/pkgconfig/libdmmp.pc +%{_libdir}/pkgconfig/libdmmp.pc %endif # with_libdmmp