rpms/dmraid/devel dmraid-1.0.0.rc14-bz211016.patch, NONE, 1.1 dmraid.spec, 1.70, 1.71
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Oct 26 13:38:10 UTC 2006
Author: heinzm
Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14367
Modified Files:
dmraid.spec
Added Files:
dmraid-1.0.0.rc14-bz211016.patch
Log Message:
bz211016 test build
dmraid-1.0.0.rc14-bz211016.patch:
README | 2 +-
lib/format/ddf/ddf1.c | 2 +-
lib/format/ddf/ddf1_lib.c | 4 +++-
lib/version.h | 6 +++---
tools/VERSION | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
--- NEW FILE dmraid-1.0.0.rc14-bz211016.patch ---
diff -urN dmraid/1.0.0.rc13/lib/format/ddf/ddf1.c dmraid/1.0.0.rc14-bz211016/lib/format/ddf/ddf1.c
--- dmraid/1.0.0.rc13/lib/format/ddf/ddf1.c 2006-09-22 16:25:45.000000000 +0200
+++ dmraid/1.0.0.rc14-bz211016/lib/format/ddf/ddf1.c 2006-10-26 15:25:44.000000000 +0200
@@ -682,7 +682,7 @@
struct ddf1_config_record *cr,
struct ddf1_phys_drive *pd)
{
- if (cr)
+ if (cr && cr->sectors)
/* Some Adaptec controllers need this clamping. */
return type(lc, ddf1, cr) == t_raid0 ?
cr->sectors - cr->sectors % stride(cr) : cr->sectors;
diff -urN dmraid/1.0.0.rc13/lib/format/ddf/ddf1_lib.c dmraid/1.0.0.rc14-bz211016/lib/format/ddf/ddf1_lib.c
--- dmraid/1.0.0.rc13/lib/format/ddf/ddf1_lib.c 2006-09-13 15:42:04.000000000 +0200
+++ dmraid/1.0.0.rc14-bz211016/lib/format/ddf/ddf1_lib.c 2006-10-26 15:15:28.000000000 +0200
@@ -57,7 +57,9 @@
struct ddf1_header *h = ddf1->primary;
/* The 0xFFFF nonsense is a weird Adaptec quirk */
- return (h->max_primary_elements == 0xFFFF && ddf1->adaptec_mode) ?
+// bz211016
+// return (h->max_primary_elements == 0xFFFF && ddf1->adaptec_mode) ?
+ return (h->max_primary_elements == 0xFFFF) ?
h->max_phys_drives : h->max_primary_elements;
}
diff -urN dmraid/1.0.0.rc13/lib/version.h dmraid/1.0.0.rc14-bz211016/lib/version.h
--- dmraid/1.0.0.rc13/lib/version.h 2006-10-11 14:31:08.000000000 +0200
+++ dmraid/1.0.0.rc14-bz211016/lib/version.h 2006-10-26 15:21:13.000000000 +0200
@@ -1,12 +1,12 @@
#ifndef DMRAID_LIB_VERSION
-#define DMRAID_LIB_VERSION "1.0.0.rc13"
+#define DMRAID_LIB_VERSION "1.0.0.rc14-bz211016"
#define DMRAID_LIB_MAJOR_VERSION 1
#define DMRAID_LIB_MINOR_VERSION 0
#define DMRAID_LIB_SUBMINOR_VERSION 0
-#define DMRAID_LIB_VERSION_SUFFIX "rc13"
+#define DMRAID_LIB_VERSION_SUFFIX "rc14-bz211016"
-#define DMRAID_LIB_DATE "(2006.10.11)"
+#define DMRAID_LIB_DATE "(2006.10.26)"
#endif
diff -urN dmraid/1.0.0.rc13/README dmraid/1.0.0.rc14-bz211016/README
--- dmraid/1.0.0.rc13/README 2006-10-17 19:06:03.000000000 +0200
+++ dmraid/1.0.0.rc14-bz211016/README 2006-10-26 15:27:45.000000000 +0200
@@ -1,6 +1,6 @@
********************************************************************************
* *
-* dmraid (Device-Mapper Software RAID support tool) 1.0.0.rc13 2006.10.11 *
+* dmraid (Device-Mapper Software RAID support tool) 1.0.0.rc14 2006.11.26 *
* *
* (C)opyright 2004-2006 Heinz Mauelshagen, Red Hat GmbH. *
* All rights reserved. *
diff -urN dmraid/1.0.0.rc13/tools/VERSION dmraid/1.0.0.rc14-bz211016/tools/VERSION
--- dmraid/1.0.0.rc13/tools/VERSION 2006-10-11 14:31:20.000000000 +0200
+++ dmraid/1.0.0.rc14-bz211016/tools/VERSION 2006-10-26 15:20:59.000000000 +0200
@@ -1 +1 @@
-1.0.0.rc13 (2006.10.11)
+1.0.0.rc14-bz211016 (2006.10.26)
Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- dmraid.spec 11 Oct 2006 20:00:31 -0000 1.70
+++ dmraid.spec 26 Oct 2006 13:38:08 -0000 1.71
@@ -6,7 +6,7 @@
Summary: dmraid (Device-mapper RAID tool and library)
Name: dmraid
-Version: 1.0.0.rc13
+Version: 1.0.0.rc14-bz211016
Release: 1%{?dist}
License: GPL
Group: System Environment/Base
@@ -15,6 +15,7 @@
BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel, zlib-devel
Requires: kpartx
Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
+Patch0: dmraid-1.0.0.rc14-bz211016.patch
%description
DMRAID supports RAID device discovery, RAID set activation and display of
@@ -30,6 +31,7 @@
%prep
%setup -q -n dmraid/%{version}
+%patch0 -p2
%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 --enable-static_link
@@ -71,6 +73,10 @@
%{_libdir}/libdmraid.so
%changelog
+* Thu Oct 26 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc14-bz211016-1
+- ddf1.c: get_size() fixed (bz#211016)
+- ddf1_lib.c: ddf1_cr_off_maxpds_helper() fixed (bz#211016)
+
* Wed Oct 11 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc13-1
- metadata.c: fixed bug returning wrang unified RAID type (bz#210085)
- pdc.c: fixed magic number check
More information about the fedora-cvs-commits
mailing list