rpms/mdadm/devel mdadm-3.0-endian-FAIL.patch, NONE, 1.1 mdadm.spec, 1.71, 1.72

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31163

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.0-endian-FAIL.patch 
Log Message:
* Fri Jul 24 2009 Doug Ledford <dledford at redhat.com> - 3.0-2
- Improved raid-check script as well as the ability to configure what devices
  get checked
- Endian patch for uuid generation


mdadm-3.0-endian-FAIL.patch:
 util.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE mdadm-3.0-endian-FAIL.patch ---
diff -up mdadm-3.0-devel3/util.c.foo mdadm-3.0-devel3/util.c
--- mdadm-3.0-devel3/util.c.foo	2009-07-09 18:57:47.000000000 -0400
+++ mdadm-3.0-devel3/util.c	2009-07-09 18:58:09.000000000 -0400
@@ -282,7 +282,11 @@ char *fname_from_uuid(struct supertype *
 	char *c = buf;
 	strcpy(c, "UUID-");
 	c += strlen(c);
+#if __BYTE_ORDER == BIG_ENDIAN
+	copy_uuid(uuid, info->uuid, st->ss->swapuuid || !strcmp(st->ss->name,"0.90"));
+#else
 	copy_uuid(uuid, info->uuid, st->ss->swapuuid);
+#endif
 	for (i = 0; i < 4; i++) {
 		id = uuid[i];
 		if (i)


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- mdadm.spec	29 Jun 2009 19:18:19 -0000	1.71
+++ mdadm.spec	24 Jul 2009 17:33:11 -0000	1.72
@@ -1,12 +1,14 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
+Source4:     mdadm-raid-check-sysconfig
 Patch1:      mdadm-2.5.2-static.patch
+Patch2:      mdadm-3.0-endian-FAIL.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -28,21 +30,23 @@ file can be used to help with some commo
 %prep
 %setup -q
 %patch1 -p1 -b .static
+%patch2 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install-static
-rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/*
-install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
-install -Dp -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/raid-check
-install -Dp -m 644 %{SOURCE3} $RPM_BUILD_ROOT/lib/udev/rules.d/65-md-incremental.rules
-mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install install-static
+rm -f %{buildroot}/lib/udev/rules.d/*
+install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor
+install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check
+install -Dp -m 644 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules
+install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check
+mkdir -p -m 700 %{buildroot}/var/run/mdadm
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 if [ "$1" = 1 ]; then
@@ -68,9 +72,15 @@ fi
 %{_initrddir}/*
 %{_mandir}/man*/md*
 %{_sysconfdir}/cron.weekly/*
+%config(noreplace) %{_sysconfdir}/sysconfig/*
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Jul 24 2009 Doug Ledford <dledford at redhat.com> - 3.0-2
+- Improved raid-check script as well as the ability to configure what devices
+  get checked
+- Endian patch for uuid generation
+
 * Mon Jun 29 2009 Doug Ledford <dledford at redhat.com> - 3.0-1
 - Remove stale patches already accepted by upstream
 - Fix the raid-check script to only try and check a device if it is