pool/multipath-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 155540 from Base:System

Browse Source 
license update: GPL-2.0
Substantial number of GPL-2.0 files in the package (forwarded request 155532 from babelworx)

OBS-URL: https://build.opensuse.org/request/show/155540
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=53
This commit is contained in:
Stephan Kulow 2013-02-17 16:07:10 +00:00 committed by Git OBS Bridge
commit 250d6ecff9
7 changed files with 109 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
0002-fix-installation-of-multipath-rule.patch
View File

@ -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

13
mpath-tools-service.patch
View File

@ -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

3
multipath-tools-0.4.9-opensuse-12.2.diff.bz2
View File

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

3
multipath-tools-0.4.9-opensuse-12.3.diff.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45315c952d9405872a12d5100907855f49561b365bdaab9eea85ab893e4575a8
size 128651

29
multipath-tools-make-flexible-install-of-systemd-and-udev-files.patch Normal file
View File

@ -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

45
multipath-tools.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
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
- 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
- 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 +249,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 +333,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 +510,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 +546,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 +560,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 +647,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 +659,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 +673,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 +848,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 +991,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 +1012,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 +1022,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
-------------------------------------------------------------------

85
multipath-tools.spec
View File

@ -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,25 +19,28 @@
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: GPL-2.0
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
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
@ -72,6 +75,20 @@ makes multipath maps partionable.
Authors:
--------
Christophe Varoqui <christophe.varoqui@free.fr>
%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 <christophe.varoqui@free.fr>
@ -80,14 +97,15 @@ Authors:
%setup -q -n multipath-tools-%{version}
%patch0 -p1
%patch1 -p1
%patch2
%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/
rm $RPM_BUILD_ROOT/usr/include/mpath_persist.h
rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
%clean
@ -96,19 +114,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 +133,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 +144,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 +153,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
@ -165,12 +166,16 @@ 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*
%{_mandir}/man8/mpathpersist.8*
%files devel
%defattr(-,root,root)
/usr/include/mpath_persist.h
%{_mandir}/man3/mpath_persistent_*
%files -n kpartx
@ -179,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