diff --git a/.gitignore b/.gitignore index d2387e8..bc3ce8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/iprdbg.8.gz -SOURCES/iprutils-2.4.3-src.tgz +SOURCES/iprutils-2.4.8.tar.gz diff --git a/.iprutils.metadata b/.iprutils.metadata index 3a5de55..bce715a 100644 --- a/.iprutils.metadata +++ b/.iprutils.metadata @@ -1,2 +1,2 @@ ba7fff20477af3cb00dcc323690ca108454a2302 SOURCES/iprdbg.8.gz -ac631b36bb463e3acfc3ac6bec7c3830fe7caed9 SOURCES/iprutils-2.4.3-src.tgz +354584359576dc013f07572ec4cc90d80b96e024 SOURCES/iprutils-2.4.8.tar.gz diff --git a/SOURCES/0001-Service-start-is-controled-by-udev-rule.patch b/SOURCES/0001-Service-start-is-controled-by-udev-rule.patch index 2cf9077..e3f1dd2 100644 --- a/SOURCES/0001-Service-start-is-controled-by-udev-rule.patch +++ b/SOURCES/0001-Service-start-is-controled-by-udev-rule.patch @@ -13,32 +13,29 @@ Subject: [PATCH] Service start is controled by udev rule create mode 100644 systemd/iprutils.target create mode 100644 udev/rules.d/90-iprutils.rules -diff --git a/systemd/iprdump.service b/systemd/iprdump.service +diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in index f1a72ff..4f085eb 100644 ---- a/systemd/iprdump.service -+++ b/systemd/iprdump.service -@@ -7,4 +7,4 @@ Type=forking - ExecStart=/sbin/iprdump --daemon +--- a/systemd/iprdump.service.in ++++ b/systemd/iprdump.service.in +@@ -7,3 +7,3 @@ Type=forking [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target -diff --git a/systemd/iprinit.service b/systemd/iprinit.service +diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in index 2ae0ce0..1d699d6 100644 ---- a/systemd/iprinit.service -+++ b/systemd/iprinit.service -@@ -6,4 +6,4 @@ Type=forking - ExecStart=/sbin/iprinit --daemon +--- a/systemd/iprinit.service.in ++++ b/systemd/iprinit.service.in +@@ -6,3 +6,3 @@ Type=forking [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target -diff --git a/systemd/iprupdate.service b/systemd/iprupdate.service +diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in index f34ed86..732dcf4 100644 ---- a/systemd/iprupdate.service -+++ b/systemd/iprupdate.service -@@ -6,4 +6,4 @@ Type=forking - ExecStart=/sbin/iprupdate --daemon +--- a/systemd/iprupdate.service.in ++++ b/systemd/iprupdate.service.in +@@ -6,3 +6,3 @@ Type=forking [Install] -WantedBy=multi-user.target diff --git a/SOURCES/mig_fix_le.patch b/SOURCES/mig_fix_le.patch deleted file mode 100644 index b08f8e6..0000000 --- a/SOURCES/mig_fix_le.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - iprutils/iprconfig.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/iprutils/iprconfig.c -=================================================================== ---- a/iprutils/iprconfig.c 2014-12-13 22:38:20.771743011 -0600 -+++ b/iprutils/iprconfig.c 2014-12-13 22:39:12.591743020 -0600 -@@ -5229,7 +5229,7 @@ int configure_raid_migrate(i_container * - - /* set up qac and send command to adapter */ - rc = do_ipr_migrate_array_protection(array_i_con, ioa, &qac, -- dev->stripe_size, -+ ntohs(dev->stripe_size), - cur_raid_cmd->prot_level, - cur_raid_cmd->array_id); - diff --git a/SPECS/iprutils.spec b/SPECS/iprutils.spec index b06e8c7..3296c66 100644 --- a/SPECS/iprutils.spec +++ b/SPECS/iprutils.spec @@ -1,29 +1,29 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.3 -Release: 3%{?dist} +Version: 2.4.8 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}-src.tgz +Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz Patch0: 0001-Service-start-is-controled-by-udev-rule.patch -# BZ#1174371 migration between raid 0 to raid 10 fails(LE) -Patch1: mig_fix_le.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /sbin/pidof +# for iprsos +Requires: lsscsi BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-devel BuildRequires: systemd +BuildRequires: python-devel Obsoletes: ipr-utils @@ -32,20 +32,25 @@ Provides a suite of utilities to manage and configure SCSI devices supported by the ipr SCSI storage device driver. %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .udev -%patch1 -p2 - %build export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now" export LDFLAGS="-pie" + +%configure + %{__make} %install -%{__rm} -rf %{buildroot} -%{__make} INSTALL_MOD_PATH=%{buildroot} install +%make_install + +# installed service units, incorect location +%{__rm} -rf %{buildroot}/usr/share/iprutils + +# install all service units mkdir -p $RPM_BUILD_ROOT/%{_unitdir} %{__install} -m 0644 systemd/iprinit.service $RPM_BUILD_ROOT/%{_unitdir}/iprinit.service %{__install} -m 0644 systemd/iprdump.service $RPM_BUILD_ROOT/%{_unitdir}/iprdump.service @@ -58,11 +63,18 @@ mkdir -p $RPM_BUILD_ROOT/%{_udevrulesdir} # missing man page %{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ -# move all binaries from /sbin to /usr/sbin -mkdir %{buildroot}/usr/sbin -for file in iprconfig iprdbg iprdump iprinit iprupdate; do - mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file -done +%{__mv} %{buildroot}%{_sysconfdir}/bash_completion.d/iprconfig-bash-completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/iprutils +%{__chmod} 0644 %{buildroot}/etc/bash_completion.d/iprutils + +# never been shipped in Fedora/RHEL +%{__rm} -rf %{buildroot}/etc/ha.d/resource.d/iprha +%{__rm} -rf %{buildroot}/etc/ha.d/resource.d/iprha.in + +# sos plugin, should be part of sos +%{__rm} -rf %{buildroot}/%{python_sitelib}/sos/plugins/iprutils.* + +# fix permissions +%{__chmod} 0700 %{buildroot}/%{_sbindir}/iprdbg %post %systemd_post iprinit.service @@ -75,6 +87,7 @@ done %systemd_preun iprdump.service %systemd_preun iprupdate.service %systemd_preun iprutils.target + %clean %{__rm} -rf %{buildroot} @@ -88,8 +101,13 @@ done %attr(0644,root,root) %{_unitdir}/iprupdate.service %attr(0644,root,root) %{_unitdir}/iprutils.target %{_udevrulesdir}/90-iprutils.rules +%{_sysconfdir}/bash_completion.d %changelog +* Tue Jun 23 2015 Jakub Čajka - 2.4.8-1 +- Resolves: #1182038 - [7.2 FEAT] iprutils package update - ppc64/ppc64le +- Resolves: #1183460 - RHEL7.1 BE: iprutils: Set known zeroed after format + * Tue Jan 06 2015 Jakub Čajka - 2.4.3-3 - Related: #1174371 - Fixed changelog version-release