rpms/dmraid/F-12 ddf1_lsi_persistent_name.patch, NONE, 1.1 pdc_raid10_failure.patch, NONE, 1.1 dmraid.spec, 1.106, 1.107 sources, 1.26, 1.27

[Heinz Mauelshagen]

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4405

Modified Files:
	dmraid.spec sources 
Added Files:
	ddf1_lsi_persistent_name.patch pdc_raid10_failure.patch 
Log Message:
Update F-12 to rawhide 1.0.0.rc16-6

ddf1_lsi_persistent_name.patch:
 ddf1.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE ddf1_lsi_persistent_name.patch ---
diff --git a/lib/format/ddf/ddf1.c.lsi_name b/lib/format/ddf/ddf1.c
index 05b550b..c8e484b 100644
--- a/lib/format/ddf/ddf1.c
+++ b/lib/format/ddf/ddf1.c
@@ -696,6 +696,16 @@ name(struct lib_context *lc, struct ddf1 *ddf1, struct raid_dev *rd)
 			sprintf(b, "%02x%02x%02x%02x",
 				vd->guid[i], vd->guid[i + 1],
 				vd->guid[i + 2], vd->guid[i + 3]);
+
+		/*
+		 * Because the LSI bios changes the timestamp in the
+		 * metadata on every boot, we have to neutralize it
+		 * in order to allow for persistent names.
+		 *
+		 * Using a dummy string "47114711" for that.
+		 */
+		if (!strncmp((char *) vd->guid, "LSI", 3))
+			strncpy(buf + prefix + 32, "47114711", 8);
 	}
 
 out:

pdc_raid10_failure.patch:
 pdc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE pdc_raid10_failure.patch ---
diff --git a/lib/format/ataraid/pdc.c.raid10_failure b/lib/format/ataraid/pdc.c
index b0bb652..8b14d71 100644
--- a/lib/format/ataraid/pdc.c
+++ b/lib/format/ataraid/pdc.c
@@ -490,7 +490,9 @@ devices(struct raid_dev *rd, void *context)
 	if (context && pdc->raid.type != PDC_T_SPAN)
 		*((uint64_t *) context) += rd->sectors;
 
-	return pdc->raid.total_disks;
+	return is_raid10(pdc) ?
+	       pdc->raid.total_disks / 2 :
+	       pdc->raid.total_disks;
 }
 
 static int


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-12/dmraid.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- dmraid.spec	21 Sep 2009 14:29:50 -0000	1.106
+++ dmraid.spec	16 Oct 2009 11:43:16 -0000	1.107
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -24,6 +24,8 @@ Provides: dmraid-libs = %{version}-%{rel
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
+Patch1: ddf1_lsi_persistent_name.patch
+Patch2: pdc_raid10_failure.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -64,8 +66,12 @@ Device failure reporting has to be activ
 %prep
 %setup -q -n dmraid/%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%define _libdir /%{_lib}
+
 %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 --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
@@ -77,6 +83,8 @@ ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid
 
 # Provide convenience link from dmevent_tool
 (cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
+(cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
+
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
 # If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
@@ -120,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n dmraid-events
 %defattr(-,root,root)
 /%{_mandir}/man8/dmevent_tool*
+/%{_mandir}/man8/dm_dso_reg_tool*
 /sbin/dmevent_tool
 /sbin/dm_dso_reg_tool
 
@@ -130,6 +139,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Fri Oct 16 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-4
+- bz526157: fix manual pages for dmraid.static and dm_dso_reg_tool
+- bz505562: ddf1 metadata format handler LSI persistent name fix
+- bz524168: fix pdc metadata format handler to report the correct number
+  of devices in a RAID10 subset
+- bz528097: move libraries to /lib* in order to avoid catch22
+  with unmountable u/usr
+
 * Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-3
 - Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
 - Make -devel Require the main package now the dmraid-libs package is gone


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	16 Sep 2009 22:52:42 -0000	1.26
+++ sources	16 Oct 2009 11:43:17 -0000	1.27
@@ -1,2 +1 @@
-2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-32832c1dfd7e72cd4355490322fca68a  dmraid-1.0.0.rc16.tar.bz2
+507252c1b68d745c2ecbda2ceac8feea  dmraid-1.0.0.rc16.tar.bz2