From 242e73895fb8f2399b50e740b7fe248c095f99dae8c168d6155ee66ff05b0f87 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Fri, 1 Feb 2013 10:10:56 +0000 Subject: [PATCH 1/3] Accepting request 150669 from home:hreinecke:branches:Base:System - Update to latest mainline git version - Merge systemd fixes - Generate persistent device names for kpartx (bnc#799274) OBS-URL: https://build.opensuse.org/request/show/150669 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=42 --- 0002-fix-installation-of-multipath-rule.patch | 21 ------ mpath-tools-service.patch | 13 ---- multipath-tools-0.4.9-opensuse-12.2.diff.bz2 | 3 - multipath-tools-0.4.9-opensuse-12.3.diff.bz2 | 3 + multipath-tools.changes | 33 +++++---- multipath-tools.spec | 70 +++++++++---------- 6 files changed, 57 insertions(+), 86 deletions(-) delete mode 100644 0002-fix-installation-of-multipath-rule.patch delete mode 100644 mpath-tools-service.patch delete mode 100644 multipath-tools-0.4.9-opensuse-12.2.diff.bz2 create mode 100644 multipath-tools-0.4.9-opensuse-12.3.diff.bz2 diff --git a/0002-fix-installation-of-multipath-rule.patch b/0002-fix-installation-of-multipath-rule.patch deleted file mode 100644 index cfd7f62..0000000 --- a/0002-fix-installation-of-multipath-rule.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: multipath-tools-0.4.9/multipath/Makefile -=================================================================== ---- multipath-tools-0.4.9.orig/multipath/Makefile -+++ multipath-tools-0.4.9/multipath/Makefile -@@ -22,6 +22,7 @@ install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) - $(INSTALL_PROGRAM) -m 755 multipath.init.suse $(DESTDIR)$(rcdir)/boot.multipath - $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/71-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mkinitrddir) - $(INSTALL_PROGRAM) -m 755 boot-multipath.sh $(DESTDIR)$(mkinitrddir) - $(INSTALL_PROGRAM) -m 755 setup-multipath.sh $(DESTDIR)$(mkinitrddir) -@@ -31,7 +32,7 @@ install: - $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) - - uninstall: -- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -+ rm $(DESTDIR)/etc/udev/rules.d/71-multipath.rules - rm $(DESTDIR)$(bindir)/$(EXEC) - rm $(DESTDIR)$(mandir)/$(EXEC).8 - rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5 diff --git a/mpath-tools-service.patch b/mpath-tools-service.patch deleted file mode 100644 index 57dd2fe..0000000 --- a/mpath-tools-service.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- multipathd/multipathd.service.orig -+++ multipathd/multipathd.service -@@ -4,9 +4,7 @@ Before=iscsi.service iscsid.service - After=syslog.target - - [Service] --Type=forking --PIDFile=/var/run/multipathd.pid --ExecStart=/sbin/multipathd -+ExecStart=/sbin/multipathd -d - ExecReload=/sbin/multipathd reconfigure - #ExecStop=/path/to/scrip delete-me if not necessary - diff --git a/multipath-tools-0.4.9-opensuse-12.2.diff.bz2 b/multipath-tools-0.4.9-opensuse-12.2.diff.bz2 deleted file mode 100644 index 29583f5..0000000 --- a/multipath-tools-0.4.9-opensuse-12.2.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa89bdebfe991be0add95b90e8e84dc0bed2ad259b96f3e61e2ce8d574614ffd -size 111263 diff --git a/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 b/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 new file mode 100644 index 0000000..81e6f1f --- /dev/null +++ b/multipath-tools-0.4.9-opensuse-12.3.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45315c952d9405872a12d5100907855f49561b365bdaab9eea85ab893e4575a8 +size 128651 diff --git a/multipath-tools.changes b/multipath-tools.changes index dc35702..055edc9 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 1 10:29:11 CET 2013 - hare@suse.de + +- Update to latest mainline git version +- Merge systemd fixes +- Generate persistent device names for kpartx (bnc#799274) + ------------------------------------------------------------------- Sun Aug 26 02:05:37 UTC 2012 - crrodriguez@opensuse.org @@ -230,7 +237,7 @@ Fri Jan 22 16:19:17 CET 2010 - hare@suse.de Fri Jan 22 14:30:36 CET 2010 - ro@suse.de - testing for existence of /lib64 is not sufficient to find out - if we are building for a lib64 platform + if we are building for a lib64 platform ------------------------------------------------------------------- Mon Jan 11 15:10:18 CET 2010 - hare@suse.de @@ -314,7 +321,6 @@ Mon Jul 13 12:24:34 CEST 2009 - hare@suse.de - Merge feature string in assemble_map (bnc#507793) ------------------------------------------------------------------- -------------------------------------------------------------------- Fri Jun 19 10:35:46 CEST 2009 - coolo@novell.com - disable as-needed for this package as it fails to build with it @@ -492,7 +498,7 @@ Mon Nov 10 08:51:26 CET 2008 - hare@suse.de Thu Nov 6 17:36:51 CET 2008 - ro@suse.de - commenting multiline rpm macros is dangerous (read broken) - remove percent sign in commented macro lines + remove percent sign in commented macro lines ------------------------------------------------------------------- Mon Nov 3 15:37:08 CET 2008 - hare@suse.de @@ -528,7 +534,7 @@ Fri Sep 26 16:26:55 CEST 2008 - hare@suse.de ------------------------------------------------------------------- Wed Sep 24 22:59:11 CEST 2008 - ro@suse.de -- use udevadm info instead of udevinfo +- use udevadm info instead of udevinfo ------------------------------------------------------------------- Wed Sep 3 11:09:34 CEST 2008 - hare@suse.de @@ -542,7 +548,7 @@ Wed Sep 3 11:09:34 CEST 2008 - hare@suse.de ------------------------------------------------------------------- Thu Aug 28 17:08:16 CEST 2008 - ro@suse.de -- fix init scripts +- fix init scripts ------------------------------------------------------------------- Wed Jul 23 14:45:18 CEST 2008 - hare@suse.de @@ -629,7 +635,7 @@ Mon Nov 6 13:11:17 CET 2006 - hare@suse.de ------------------------------------------------------------------- Fri Oct 20 02:07:47 CEST 2006 - ro@suse.de -- make it build +- make it build ------------------------------------------------------------------- Mon Sep 25 10:03:49 CEST 2006 - hare@suse.de @@ -641,7 +647,7 @@ Mon Sep 25 10:03:49 CEST 2006 - hare@suse.de ------------------------------------------------------------------- Thu Sep 14 00:18:10 CEST 2006 - ro@suse.de -- use device-mapper-devel in BuildRequires +- use device-mapper-devel in BuildRequires ------------------------------------------------------------------- Thu Aug 31 10:56:01 CEST 2006 - hare@suse.de @@ -655,7 +661,7 @@ Thu Aug 31 10:56:01 CEST 2006 - hare@suse.de Thu Aug 17 02:07:59 CEST 2006 - ro@suse.de - workaround problem in git-patch - normal patch can't do a "rename", so copy file first + normal patch can't do a "rename", so copy file first ------------------------------------------------------------------- Tue Jul 11 15:04:59 CEST 2006 - hare@suse.de @@ -830,7 +836,7 @@ Wed Jun 15 13:31:47 CEST 2005 - meissner@suse.de ------------------------------------------------------------------- Mon Jun 13 23:51:59 CEST 2005 - ro@suse.de -- neededforbuild: udev -> sysfsutils +- neededforbuild: udev -> sysfsutils ------------------------------------------------------------------- Tue Jun 7 15:38:36 CEST 2005 - lmb@suse.de @@ -973,12 +979,12 @@ Fri Nov 5 13:58:00 CET 2004 - hare@suse.de Tue Jul 20 09:22:11 CEST 2004 - fehr@suse.de - updated README mp-tools-issues.pdf (see #40640) - + ------------------------------------------------------------------- Wed Jun 9 12:18:01 CEST 2004 - fehr@suse.de - added pdf with README to package (see #40640) - + ------------------------------------------------------------------- Thu Jun 3 18:11:41 CEST 2004 - fehr@suse.de @@ -994,7 +1000,7 @@ Thu Jun 3 09:38:49 CEST 2004 - fehr@suse.de ------------------------------------------------------------------- Wed May 26 20:14:05 CEST 2004 - uli@suse.de -- fixed to build on s390x +- fixed to build on s390x ------------------------------------------------------------------- Wed May 26 10:57:37 CEST 2004 - fehr@suse.de @@ -1004,6 +1010,7 @@ Wed May 26 10:57:37 CEST 2004 - fehr@suse.de ------------------------------------------------------------------- Tue May 25 10:43:15 CEST 2004 - fehr@suse.de -- created initial version of a SuSE package from version 0.2.0 of +- created initial version of a SuSE package from version 0.2.0 of multipath tools +------------------------------------------------------------------- diff --git a/multipath-tools.spec b/multipath-tools.spec index d999970..b19cd44 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ # # spec file for package multipath-tools # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,26 +19,23 @@ Name: multipath-tools BuildRequires: device-mapper-devel BuildRequires: libaio-devel +BuildRequires: libudev-devel BuildRequires: readline-devel +BuildRequires: systemd Url: http://christophe.varoqui.free.fr/ Requires: device-mapper Requires: kpartx -PreReq: %insserv_prereq %fillup_prereq coreutils grep /sbin/mkinitrd +PreReq: %insserv_prereq %fillup_prereq coreutils grep Version: 0.4.9 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper -License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain ; MIT +License: LGPL-2.1+ Group: System/Base -Source: multipath-tools-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: %{name}-%{version}-opensuse-12.2.diff.bz2 -Patch1: 0002-fix-installation-of-multipath-rule.patch -Patch2: mpath-tools-service.patch -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd %{?systemd_requires} %define has_systemd 1 -%endif +Source: multipath-tools-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: %{name}-%{version}-opensuse-12.3.diff.bz2 %description This package provides the tools to manage multipathed devices by @@ -72,6 +69,20 @@ makes multipath maps partionable. +Authors: +-------- + Christophe Varoqui + +%package devel +Summary: Development libraries for multipath-tools +Group: Development/Libraries/Other +Requires: device-mapper + +%description devel +This package contains the development libraries for multipath-tools +and libmpath_persist. + + Authors: -------- Christophe Varoqui @@ -79,15 +90,15 @@ Authors: %prep %setup -q -n multipath-tools-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 + %build make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib %install make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install +# Compability with older versions +mv $RPM_BUILD_ROOT/etc/udev/rules.d/kpartx.rules $RPM_BUILD_ROOT/etc/udev/rules.d/70-kpartx.rules mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/ -rm $RPM_BUILD_ROOT/usr/include/mpath_persist.h rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so %clean @@ -96,19 +107,15 @@ rm -rf $RPM_BUILD_ROOT; %pre [ -f /.buildenv ] && exit 0 if [ -f /etc/init.d/multipathd ] && dmsetup --target multipath table | grep -q multipath ; then - /etc/init.d/multipathd stop -%if 0%{?has_systemd} -%service_add_pre multipathd.service -%endif + /etc/init.d/multipathd stop + %service_add_pre multipathd.service fi %post [ -f /.buildenv ] && exit 0 +%{run_ldconfig} if dmsetup --target multipath table | grep -q multipath ; then - /etc/init.d/multipathd start -%if 0%{?has_systemd} -%service_add_post multipathd.service -%endif + %service_add_post multipathd.service fi [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then @@ -119,14 +126,8 @@ elif [ -x /sbin/mkinitrd ]; then fi exit 0 -#{insserv /etc/init.d/multipathd} -#{fillup_and_insserv boot.multipath} - %preun -%stop_on_removal multipathd -%if 0%{?has_systemd} %service_del_preun multipathd.service -%endif %postun [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -136,12 +137,8 @@ if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then elif [ -x /sbin/mkinitrd ]; then /sbin/mkinitrd fi - -%if 0%{?has_systemd} %service_del_postun multipathd.service -%endif - -%{insserv_cleanup} +%{run_ldconfig} %files %defattr(-,root,root) @@ -149,9 +146,6 @@ fi %doc multipath.conf* %dir /etc/udev %dir /etc/udev/rules.d -%config /etc/init.d/multipathd -%config /etc/init.d/boot.multipath -%config /etc/udev/rules.d/71-multipath.rules /%{_lib}/libmultipath.so.0 /%{_lib}/libmpathpersist.so.0 /%{_lib}/multipath @@ -171,6 +165,10 @@ fi %{_mandir}/man5/multipath.conf.5* %{_mandir}/man8/multipathd.8* %{_mandir}/man8/mpathpersist.8* + +%files devel +%defattr(-,root,root) +/usr/include/mpath_persist.h %{_mandir}/man3/mpath_persistent_* %files -n kpartx From d42cda752980830c70c2e92906e1a7504191d9bd176b1dff067361081fd8e4fe Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Fri, 15 Feb 2013 12:31:32 +0000 Subject: [PATCH 2/3] Accepting request 155509 from home:rmilasan:branches:Base:System - Make installation of systemd unit and udev files more flexible. add: multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch OBS-URL: https://build.opensuse.org/request/show/155509 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=43 --- ...le-install-of-systemd-and-udev-files.patch | 29 +++++++++++++++++++ multipath-tools.changes | 6 ++++ multipath-tools.spec | 19 ++++++++---- 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch diff --git a/multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch b/multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch new file mode 100644 index 0000000..fbfdede --- /dev/null +++ b/multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch @@ -0,0 +1,29 @@ +Index: multipath-tools-0.4.9/Makefile.inc +=================================================================== +--- multipath-tools-0.4.9.orig/Makefile.inc ++++ multipath-tools-0.4.9/Makefile.inc +@@ -21,10 +21,14 @@ ifndef LIB + endif + endif + ++ifndef SYSDPATH ++ SYSDPATH=lib ++endif ++ + prefix = + exec_prefix = $(prefix) + bindir = $(exec_prefix)/sbin +-libudevdir = ${prefix}/lib/udev ++libudevdir = ${prefix}/$(SYSDPATH)/udev + multipathdir = $(TOPDIR)/libmultipath + mandir = $(prefix)/usr/share/man/man8 + man5dir = $(prefix)/usr/share/man/man5 +@@ -32,7 +36,7 @@ man3dir = $(prefix)/usr/share/man/m + rcdir = $(prefix)/etc/init.d + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath +-unitdir = $(prefix)/lib/systemd/system ++unitdir = $(prefix)/$(SYSDPATH)/systemd/system + mpathpersistdir = $(TOPDIR)/libmpathpersist + + GZIP = /bin/gzip -9 -c diff --git a/multipath-tools.changes b/multipath-tools.changes index 055edc9..1150a30 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 15 12:15:09 UTC 2013 - rmilasan@suse.com + +- Make installation of systemd unit and udev files more flexible. + add: multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch + ------------------------------------------------------------------- Fri Feb 1 10:29:11 CET 2013 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index b19cd44..bed69be 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -36,6 +36,12 @@ Group: System/Base Source: multipath-tools-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}-opensuse-12.3.diff.bz2 +Patch1: multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch +%if %suse_version > 1220 +%define _sysdir usr/lib +%else +%define _sysdir lib +%endif %description This package provides the tools to manage multipathed devices by @@ -90,12 +96,13 @@ Authors: %prep %setup -q -n multipath-tools-%{version} %patch0 -p1 +%patch1 -p1 %build -make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib +make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSDPATH=%{_sysdir} %install -make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install +make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSDPATH=%{_sysdir} install # Compability with older versions mv $RPM_BUILD_ROOT/etc/udev/rules.d/kpartx.rules $RPM_BUILD_ROOT/etc/udev/rules.d/70-kpartx.rules mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/ @@ -159,8 +166,8 @@ fi /lib/mkinitrd/scripts/setup-multipath.sh /lib/mkinitrd/scripts/boot-multipathd.sh /lib/mkinitrd/scripts/boot-killmultipathd.sh -%dir /lib/systemd/system -/lib/systemd/system/multipathd.service +%dir /%{_sysdir}/systemd/system +/%{_sysdir}/systemd/system/multipathd.service %{_mandir}/man8/multipath.8* %{_mandir}/man5/multipath.conf.5* %{_mandir}/man8/multipathd.8* @@ -177,8 +184,8 @@ fi %dir /etc/udev/rules.d %config /etc/udev/rules.d/70-kpartx.rules /sbin/kpartx -%dir /lib/udev -/lib/udev/kpartx_id +%dir /%{_sysdir}/udev +/%{_sysdir}/udev/kpartx_id %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-kpartx.sh From c8e183830ce79b1b2bfd0dab5304079fd536abc9caff7fae57eb68d466797032 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Fri, 15 Feb 2013 14:25:42 +0000 Subject: [PATCH 3/3] Accepting request 155532 from home:babelworx:ldig:branches:Base:System license update: GPL-2.0 Substantial number of GPL-2.0 files in the package OBS-URL: https://build.opensuse.org/request/show/155532 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=44 --- multipath-tools.changes | 6 ++++++ multipath-tools.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index 1150a30..8e24910 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 15 13:55:24 UTC 2013 - cfarrell@suse.com + +- license update: GPL-2.0 + Substantial number of GPL-2.0 files in the package + ------------------------------------------------------------------- Fri Feb 15 12:15:09 UTC 2013 - rmilasan@suse.com diff --git a/multipath-tools.spec b/multipath-tools.spec index bed69be..6454409 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -29,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq coreutils grep Version: 0.4.9 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper -License: LGPL-2.1+ +License: GPL-2.0 Group: System/Base %{?systemd_requires} %define has_systemd 1