diff --git a/.iprutils.metadata b/.iprutils.metadata index 80b9c0f..b9e99bf 100644 --- a/.iprutils.metadata +++ b/.iprutils.metadata @@ -1,2 +1,2 @@ -fb2d796aa7819280da329f0097bc5b44110e06c0 SOURCES/iprutils-2.3.15-src.tgz +c472b19fbf00792d98766955f463596d1d7a26d0 SOURCES/iprutils-2.3.16-src.tgz ba7fff20477af3cb00dcc323690ca108454a2302 SOURCES/iprdbg.8.gz diff --git a/SOURCES/iprutils-t2-array-1061166.patch b/SOURCES/iprutils-t2-array-1061166.patch new file mode 100644 index 0000000..64b4510 --- /dev/null +++ b/SOURCES/iprutils-t2-array-1061166.patch @@ -0,0 +1,49 @@ +--- + iprutils/iprconfig.c | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + +Index: b/iprutils/iprconfig.c +=================================================================== +--- a/iprutils/iprconfig.c 2014-01-31 17:18:38.000000000 -0600 ++++ b/iprutils/iprconfig.c 2014-01-31 17:22:35.847766342 -0600 +@@ -3847,6 +3847,8 @@ int confirm_raid_start(i_container *i_co + rc = ipr_start_array_protection(ioa, + cur_raid_cmd->stripe_size, + cur_raid_cmd->prot_level); ++ if (rc) ++ return RC_19_Create_Fail; + } + + rc = raid_start_complete(); +@@ -13297,7 +13299,7 @@ static int format_for_raid(char **args, + static int raid_create(char **args, int num_args) + { + int i, num_devs = 0, rc; +- int hdd_count = 0, ssd_count = 0, non_4k_count = 0, is_4k_count = 0; ++ int non_4k_count = 0, is_4k_count = 0; + int next_raid_level, next_stripe_size, next_qdepth; + char *raid_level = IPR_DEFAULT_RAID_LVL; + int stripe_size, qdepth, zeroed_devs; +@@ -13355,22 +13357,12 @@ static int raid_create(char **args, int + return -EINVAL; + } + +- if (dev->block_dev_class & IPR_SSD) +- ssd_count++; +- else +- hdd_count++; +- + if (dev->block_dev_class & IPR_BLK_DEV_CLASS_4K) + is_4k_count++; + else + non_4k_count++; + } + +- if (hdd_count > 0 && ssd_count > 0) { +- syslog(LOG_ERR, _("SSDs and HDDs can not be mixed in an array.\n")); +- return -EINVAL; +- } +- + if (is_4k_count > 0 && non_4k_count > 0) { + syslog(LOG_ERR, _("4K disks and 5XX disks can not be mixed in an array.\n")); + return -EINVAL; diff --git a/SPECS/iprutils.spec b/SPECS/iprutils.spec index 1cd1424..578d3bf 100644 --- a/SPECS/iprutils.spec +++ b/SPECS/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.15 -Release: 1%{?dist} +Version: 2.3.16 +Release: 4%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -13,6 +13,7 @@ Source1: iprdbg.8.gz Patch0: %{name}-cflags.patch Patch1: %{name}-initscripts.patch +Patch2: %{name}-t2-array-1061166.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /sbin/pidof @@ -33,6 +34,7 @@ supported by the ipr SCSI storage device driver. %setup -q -n %{name} %patch0 -p1 -b .cflags %patch1 -p1 -b .initscripts +%patch2 -p2 -b .t2array %build CFLAGS="%{optflags}" %{__make} @@ -47,7 +49,7 @@ CFLAGS="%{optflags}" %{__make} %{__install} -m 0755 init.d/iprupdate %{buildroot}%{_sysconfdir}/rc.d/init.d/iprupdate # missing man page -%{__install} -m 0755 %SOURCE1 %{buildroot}%{_mandir}/man8/ +%{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ # move all binaries from /sbin to /usr/sbin mkdir %{buildroot}/usr/sbin @@ -72,10 +74,27 @@ done %defattr(-,root,root,-) %doc README LICENSE %{_sbindir}/* -%{_mandir}/man*/* +%attr(0644,root,root) %{_mandir}/man*/* %{_sysconfdir}/rc.d/init.d/* %changelog +* Fri Mar 07 2014 Karsten Hopp 2.3.16-4 +- add fix for T2 arrays +- Resolves: rhbz 1061166 + +* Mon Mar 03 2014 Karsten Hopp 2.3.16-3 +- fix permissions of man pages +- Resolves: rhbz 1061756 + +* Fri Jan 24 2014 Daniel Mach - 2.3.16-2 +- Mass rebuild 2014-01-24 + +* Tue Jan 07 2014 Filip Kocina - 2.3.16-1 +- Resolves: #1030303 - update to the latest upstream + +* Fri Dec 27 2013 Daniel Mach - 2.3.15-2 +- Mass rebuild 2013-12-27 + * Thu Sep 12 2013 Filip Kocina - 2.3.15-1 - Resolves: #981666 - update to the latest upstream