rpms/dmraid/devel dmraid-1.0.0.rc15-isw-raid10.patch, NONE, 1.1 dmraid-1.0.0.rc15-whitespace.patch, NONE, 1.1 dmraid.spec, 1.89, 1.90
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Feb 5 16:33:52 UTC 2009
Author: jwrdegoede
Update of /cvs/extras/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28076
Modified Files:
dmraid.spec
Added Files:
dmraid-1.0.0.rc15-isw-raid10.patch
dmraid-1.0.0.rc15-whitespace.patch
Log Message:
* Thu Feb 5 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-3
- Fix mismatch between BIOS and dmraid's view of ISW raid 10 sets
dmraid-1.0.0.rc15-isw-raid10.patch:
--- NEW FILE dmraid-1.0.0.rc15-isw-raid10.patch ---
diff -up 1.0.0.rc15/lib/format/ataraid/isw.c~ 1.0.0.rc15/lib/format/ataraid/isw.c
--- 1.0.0.rc15/lib/format/ataraid/isw.c~ 2008-09-17 08:58:52.000000000 -0400
+++ 1.0.0.rc15/lib/format/ataraid/isw.c 2009-02-05 07:04:35.576126020 -0500
@@ -155,7 +155,7 @@ name(struct lib_context *lc, struct raid
while (i--) {
if (disk == isw->disk + i) {
- id = i % 2;
+ id = i / 2;
goto ok;
}
}
dmraid-1.0.0.rc15-whitespace.patch:
--- NEW FILE dmraid-1.0.0.rc15-whitespace.patch ---
===================================================================
RCS file: /cvs/dm/dmraid/lib/device/scsi.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dmraid/lib/device/scsi.c 2008/09/19 14:31:11 1.3
+++ dmraid/lib/device/scsi.c 2008/10/31 12:22:35 1.4
@@ -110,7 +110,7 @@
}
ret = ret &&
- (di->serial = dbg_strdup((char *) &response[p->start + 1]));
+ (di->serial = dbg_strdup(remove_white_space (lc, (char *) &response[p->start + 1], serial_len)));
}
dbg_free(response);
Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- dmraid.spec 25 Sep 2008 14:17:12 -0000 1.89
+++ dmraid.spec 5 Feb 2009 16:33:21 -0000 1.90
@@ -1,10 +1,12 @@
Summary: Device-mapper RAID tool and library
Name: dmraid
Version: 1.0.0.rc15
-Release: 1%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://people.redhat.com/heinzm/sw/dmraid
+Patch0: dmraid-1.0.0.rc15-whitespace.patch
+Patch1: dmraid-1.0.0.rc15-isw-raid10.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
Requires: kpartx
@@ -40,6 +42,8 @@
%prep
%setup -q -n dmraid/%{version}
+%patch0 -p1
+%patch1 -p1
%build
%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
@@ -85,6 +89,12 @@
%attr(755,root,root) %{_libdir}/libdmraid.so.*
%changelog
+* Thu Feb 5 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-3
+- Fix mismatch between BIOS and dmraid's view of ISW raid 10 sets
+
+* Tue Nov 18 2008 Bill Nottingham <notting at redhat.com> - 1.0.0.rc15-2
+- Re-add upstream whitespace removal patch (#468649, #470634)
+
* Thu Sep 25 2008 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc15-1
- Update to version 1.0.0.rc15
More information about the fedora-extras-commits
mailing list