[packages/multipath-tools] - updated to 0.7.9 - updated kpartx-udev patch - removed obsolete types patch - added paths patch (a
qboosh
qboosh at pld-linux.org
Sat Dec 1 22:00:53 CET 2018
commit 4872eb89d5f224c4b5b9072a353560bfc4741d55
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Dec 1 22:05:15 2018 +0100
- updated to 0.7.9
- updated kpartx-udev patch
- removed obsolete types patch
- added paths patch (adjust .rules files for split /usr)
multipath-tools-kpartx-udev.patch | 25 ++++++++++----------
multipath-tools-paths.patch | 49 +++++++++++++++++++++++++++++++++++++++
multipath-tools-types.patch | 11 ---------
multipath-tools.spec | 35 +++++++++++++++++-----------
4 files changed, 83 insertions(+), 37 deletions(-)
---
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 48d1c91..08d3914 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -5,21 +5,21 @@
Summary: Tools to manage multipathed devices with the device-mapper
Summary(pl.UTF-8): Implementacja wielotrasowego dostępu do zasobów przy użyciu device-mappera
Name: multipath-tools
-Version: 0.6.1
-%define gitref ec56ef2
-Release: 2
+Version: 0.7.9
+%define gitref 5c67a8b
+Release: 1
License: GPL v2
Group: Base
-# http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=ec56ef2052a9ba1e0fde301cd808452b2ac1a097;sf=tgz
-Source0: http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=ec56ef2052a9ba1e0fde301cd808452b2ac1a097;sf=tgz;fakeout=/%{name}-%{version}.tar.gz
-# Source0-md5: e84161c6088b5cd56a3fd61b4b88da9a
+# http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=%{gitref};sf=tgz
+Source0: http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=%{version};sf=tgz;fakeout=/%{name}-%{version}.tar.gz
+# Source0-md5: c5606ce834a3e5795c7ae8b12eb52db9
Source100: branch.sh
Source1: multipathd.init
Source2: multipathd.sysconfig
Source3: %{name}-bindings
# http://git.opensvc.com/?p=multipath-tools/.git;a=blob_plain;f=multipath.conf.defaults;hb=d569988e7528cf3484b6acae19dc093de41a2488
Source4: multipath.conf.defaults
-Patch0: %{name}-types.patch
+Patch0: %{name}-paths.patch
Patch1: %{name}-kpartx-udev.patch
Patch2: config.patch
URL: http://christophe.varoqui.free.fr/
@@ -125,7 +125,7 @@ kpartx odwzorowuje liniowe mapy urządzeń na partycje urządzeń, co
umożliwia tworzenie partycji na odwzorowaniach wielotrasowych.
%prep
-%setup -q -n %{name}-%{gitref}
+%setup -q -n %{name}-%{version}-%{gitref}
%patch0 -p1
%patch1 -p1
cp -p %{SOURCE4} .
@@ -157,7 +157,8 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_sysconfdir}/multipath
DESTDIR=$RPM_BUILD_ROOT \
LIB=%{_lib} \
libudevdir=/lib/udev \
- unitdir=%{systemdunitdir}
+ unitdir=%{systemdunitdir} \
+ usr_prefix=%{_prefix}
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/multipathd
cp -p multipath.conf.defaults $RPM_BUILD_ROOT%{_sysconfdir}/multipath.conf
@@ -166,9 +167,10 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/multipath/bindings
# devel files in /usr
install -d $RPM_BUILD_ROOT%{_libdir}
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/libmpath{cmd,persist}.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/{libmpathcmd,libmpathpersist,libmultipath}.so
ln -sf /%{_lib}/libmpathpersist.so.0 $RPM_BUILD_ROOT%{_libdir}/libmpathpersist.so
ln -sf /%{_lib}/libmpathcmd.so.0 $RPM_BUILD_ROOT%{_libdir}/libmpathcmd.so
+ln -sf /%{_lib}/libmultipath.so.0 $RPM_BUILD_ROOT%{_libdir}/libmultipath.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -196,8 +198,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc AUTHOR ChangeLog FAQ README
-%doc multipath.conf.defaults
+%doc README README.alua multipath.conf.defaults
%attr(755,root,root) %{_sbindir}/mpathpersist
%attr(755,root,root) %{_sbindir}/multipath
%attr(755,root,root) %{_sbindir}/multipathd
@@ -209,6 +210,7 @@ fi
%dir %{_sysconfdir}/multipath
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/multipath/bindings
/lib/udev/rules.d/11-dm-mpath.rules
+/lib/udev/rules.d/11-dm-parts.rules
/lib/udev/rules.d/56-multipath.rules
%{systemdunitdir}/multipathd.service
%{systemdunitdir}/multipathd.socket
@@ -222,20 +224,27 @@ fi
%attr(755,root,root) /%{_lib}/libmpathcmd.so.0
%attr(755,root,root) /%{_lib}/libmpathpersist.so.0
%attr(755,root,root) /%{_lib}/libmultipath.so.0
+%attr(755,root,root) %{_libdir}/libdmmp.so.0.2.0
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdmmp.so
%attr(755,root,root) %{_libdir}/libmpathcmd.so
%attr(755,root,root) %{_libdir}/libmpathpersist.so
+%attr(755,root,root) %{_libdir}/libmultipath.so
+%{_includedir}/libdmmp
%{_includedir}/mpath_cmd.h
%{_includedir}/mpath_persist.h
+%{_pkgconfigdir}/libdmmp.pc
+%{_mandir}/man3/dmmp_*.3*
+%{_mandir}/man3/libdmmp.h.3*
%{_mandir}/man3/mpath_persistent_reserve_in.3*
%{_mandir}/man3/mpath_persistent_reserve_out.3*
%files -n kpartx
%defattr(644,root,root,755)
-%doc kpartx/README
%attr(755,root,root) %{_sbindir}/kpartx
%attr(755,root,root) /lib/udev/kpartx_id
/lib/udev/rules.d/66-kpartx.rules
+/lib/udev/rules.d/68-del-part-nodes.rules
%{_mandir}/man8/kpartx.8*
diff --git a/multipath-tools-kpartx-udev.patch b/multipath-tools-kpartx-udev.patch
index 372a793..5ebdd50 100644
--- a/multipath-tools-kpartx-udev.patch
+++ b/multipath-tools-kpartx-udev.patch
@@ -1,21 +1,20 @@
---- multipath-tools-0.4.9/kpartx/kpartx.rules~ 2013-05-17 23:53:47.000000000 +0300
-+++ multipath-tools-0.4.9/kpartx/kpartx.rules 2013-05-17 23:54:09.123094293 +0300
-@@ -7,6 +7,9 @@
- KERNEL!="dm-*", GOTO="kpartx_end"
- ACTION=="remove", GOTO="kpartx_end"
+--- multipath-tools-0.7.9-5c67a8b/kpartx/kpartx.rules.orig 2018-12-01 21:57:01.880902692 +0100
++++ multipath-tools-0.7.9-5c67a8b/kpartx/kpartx.rules 2018-12-01 22:00:00.727567315 +0100
+@@ -8,6 +8,9 @@
+ ACTION!="add|change", GOTO="kpartx_end"
+ ENV{DM_UUID}!="?*", GOTO="kpartx_end"
+IMPORT{program}="/sbin/dmsetup export -j%M -m%m"
+ENV{DM_NAME}!="?*", GOTO="kpartx_end"
+
- ENV{DM_TABLE_STATE}!="LIVE", GOTO="kpartx_end"
+ # Create dm tables for partitions on multipath devices.
+ ENV{DM_UUID}!="mpath-?*", GOTO="mpath_kpartx_end"
- ENV{DM_UUID}=="?*", IMPORT{program}=="/lib/udev/kpartx_id %M %m $env{DM_UUID}"
-@@ -36,7 +36,7 @@
+@@ -32,6 +35,6 @@
+ GOTO="kpartx_end"
- # Create dm tables for partitions
- ENV{DM_STATE}!="SUSPENDED", ENV{DM_UUID}=="mpath-*", \
-- RUN+="/sbin/kpartx -u -p -part /dev/$name"
-+ RUN+="/sbin/kpartx -u /dev/$name"
+ LABEL="run_kpartx"
+-RUN+="/sbin/kpartx -un -p -part /dev/$name"
++RUN+="/sbin/kpartx -un /dev/$name"
LABEL="kpartx_end"
-
diff --git a/multipath-tools-paths.patch b/multipath-tools-paths.patch
new file mode 100644
index 0000000..be9400e
--- /dev/null
+++ b/multipath-tools-paths.patch
@@ -0,0 +1,49 @@
+--- multipath-tools-0.7.9-5c67a8b/kpartx/del-part-nodes.rules.orig 2018-11-14 08:37:05.000000000 +0100
++++ multipath-tools-0.7.9-5c67a8b/kpartx/del-part-nodes.rules 2018-12-01 21:50:39.614240387 +0100
+@@ -28,6 +28,6 @@
+ LABEL="del_part_nodes"
+ IMPORT{db}="DM_DEL_PART_NODES"
+ ENV{DM_DEL_PART_NODES}!="1", ENV{DM_DEL_PART_NODES}="1", \
+- RUN+="/usr/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
++ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
+
+ LABEL="end_del_part_nodes"
+--- multipath-tools-0.7.9-5c67a8b/multipath/11-dm-mpath.rules.orig 2018-11-14 08:37:05.000000000 +0100
++++ multipath-tools-0.7.9-5c67a8b/multipath/11-dm-mpath.rules 2018-12-01 21:53:03.777572075 +0100
+@@ -101,7 +101,7 @@
+
+ # kpartx_id is very robust, it works for suspended maps and maps
+ # with 0 dependencies. It sets DM_TYPE, DM_PART, DM_WWN
+-TEST=="/usr/lib/udev/kpartx_id", \
++TEST=="/lib/udev/kpartx_id", \
+ IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}"
+
+ ENV{DM_TYPE}=="?*", ENV{DM_SERIAL}=="?*", \
+--- multipath-tools-0.7.9-5c67a8b/multipath/multipath.rules.orig 2018-11-14 08:37:05.000000000 +0100
++++ multipath-tools-0.7.9-5c67a8b/multipath/multipath.rules 2018-12-01 21:55:31.350903723 +0100
+@@ -2,7 +2,7 @@
+ SUBSYSTEM!="block", GOTO="end_mpath"
+ KERNEL!="sd*|dasd*|nvme*", GOTO="end_mpath"
+ ACTION=="remove", TEST=="/dev/shm/multipath/find_multipaths/$major:$minor", \
+- RUN+="/usr/bin/rm -f /dev/shm/multipath/find_multipaths/$major:$minor"
++ RUN+="/bin/rm -f /dev/shm/multipath/find_multipaths/$major:$minor"
+ ACTION!="add|change", GOTO="end_mpath"
+
+ IMPORT{cmdline}="nompath"
+@@ -71,7 +71,7 @@
+ #
+ # We must trigger an "add" event because LVM2 will only act on those.
+
+-RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Wants=multipathd.service --property After=multipathd.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /usr/bin/udevadm trigger --action=add $sys$devpath"
++RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Wants=multipathd.service --property After=multipathd.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /sbin/udevadm trigger --action=add $sys$devpath"
+
+ LABEL="pretend_mpath"
+ ENV{DM_MULTIPATH_DEVICE_PATH}="1"
+@@ -86,6 +86,6 @@
+ ENV{FIND_MULTIPATHS_WAIT_UNTIL}=="?*", \
+ ENV{FIND_MULTIPATHS_WAIT_UNTIL}!="0", \
+ ENV{FIND_MULTIPATHS_WAIT_CANCELLED}="1", \
+- RUN+="/usr/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
++ RUN+="/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
+
+ LABEL="end_mpath"
diff --git a/multipath-tools-types.patch b/multipath-tools-types.patch
deleted file mode 100644
index 85f7419..0000000
--- a/multipath-tools-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- multipath-tools-ec56ef2/multipathd/cli.c.orig 2016-05-10 08:12:35.000000000 +0200
-+++ multipath-tools-ec56ef2/multipathd/cli.c 2016-07-04 20:34:08.698495842 +0200
-@@ -109,7 +109,7 @@
- }
-
- int
--set_unlocked_handler_callback (unsigned long fp,int (*fn)(void *, char **, int *, void *))
-+set_unlocked_handler_callback (uint64_t fp,int (*fn)(void *, char **, int *, void *))
- {
- struct handler * h = find_handler(fp);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/multipath-tools.git/commitdiff/4872eb89d5f224c4b5b9072a353560bfc4741d55
More information about the pld-cvs-commit
mailing list