rpms/mdadm/devel mdadm-3.0-incremental.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 mdadm-3.0-cast.patch, 1.1, 1.2 mdadm.spec, 1.63, 1.64 sources, 1.22, 1.23 mdadm-3.0-alias.patch, 1.1, NONE mdadm-3.0-udev.patch, 1.1, NONE mdadm-3.0-warn.patch, 1.1, NONE mdadm.rules, 1.5, NONE
Doug Ledford
dledford at fedoraproject.org
Wed Mar 18 18:22:37 UTC 2009
Author: dledford
Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19547
Modified Files:
.cvsignore mdadm-3.0-cast.patch mdadm.spec sources
Added Files:
mdadm-3.0-incremental.patch
Removed Files:
mdadm-3.0-alias.patch mdadm-3.0-udev.patch
mdadm-3.0-warn.patch mdadm.rules
Log Message:
* Tue Mar 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.1
- Update to latest devel release
- Remove the no longer necessary udev patch
- Remove the no longer necessary warn patch
- Remove the no longer necessary alias patch
- Update the mdadm.rules file to only pay attention to device adds, not
changes and to enable incremental assembly
- Add a cron job to run a weekly repair of the array to correct bad sectors
- Resolves: bz474436, bz490972
mdadm-3.0-incremental.patch:
--- NEW FILE mdadm-3.0-incremental.patch ---
--- mdadm-3.0-devel3/udev-md-raid.rules.incremental 2009-03-18 14:16:24.000000000 -0400
+++ mdadm-3.0-devel3/udev-md-raid.rules 2009-03-18 14:17:11.000000000 -0400
@@ -1,10 +1,10 @@
# do not edit this file, it will be overwritten on update
SUBSYSTEM!="block", GOTO="md_end"
-ACTION!="add|change", GOTO="md_end"
+ACTION!="add", GOTO="md_end"
# import data from a raid member and activate it
-#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
# import data from a raid set
KERNEL!="md*", GOTO="md_end"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 12 Feb 2009 15:10:22 -0000 1.22
+++ .cvsignore 18 Mar 2009 18:22:06 -0000 1.23
@@ -11,3 +11,4 @@
mdadm-2.6.7.tar.bz2
mdadm-2.6.7.1.tar.bz2
mdadm-3.0-devel2.tar.bz2
+mdadm-3.0-devel3.tar.bz2
mdadm-3.0-cast.patch:
Index: mdadm-3.0-cast.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm-3.0-cast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdadm-3.0-cast.patch 13 Feb 2009 20:55:51 -0000 1.1
+++ mdadm-3.0-cast.patch 18 Mar 2009 18:22:06 -0000 1.2
@@ -1,6 +1,6 @@
---- mdadm-3.0-devel2/super-ddf.c.typedef 2009-02-13 15:26:56.000000000 -0500
-+++ mdadm-3.0-devel2/super-ddf.c 2009-02-13 15:28:17.000000000 -0500
-@@ -1043,9 +1043,9 @@ static void examine_vd(int n, struct ddf
+--- mdadm-3.0-devel3/super-ddf.c.orig 2009-03-10 01:39:41.000000000 -0400
++++ mdadm-3.0-devel3/super-ddf.c 2009-03-17 15:22:41.000000000 -0400
+@@ -1062,9 +1062,9 @@
map_num(ddf_sec_level, vc->srl) ?: "-unknown-");
}
printf(" Device Size[%d] : %llu\n", n,
@@ -12,11 +12,12 @@
}
}
-@@ -1105,7 +1105,7 @@ static void examine_pds(struct ddf_super
- (state&32)? ", Unrecovered Read Errors": "",
- (state&64)? ", Missing" : "");
- printf(" Avail Size[%d] : %llu K\n", i,
-- __be64_to_cpu(pd->config_size)>>1);
+@@ -1111,7 +1111,8 @@
+ //printf("\n");
+ printf(" %3d %08x ", i,
+ __be32_to_cpu(pd->refnum));
+- printf("%lluK ", __be64_to_cpu(pd->config_size)>>1);
++ printf("%lluK ",
+ (unsigned long long)__be64_to_cpu(pd->config_size)>>1);
for (dl = sb->dlist; dl ; dl = dl->next) {
if (dl->disk.refnum == pd->refnum) {
Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- mdadm.spec 26 Feb 2009 00:03:42 -0000 1.63
+++ mdadm.spec 18 Mar 2009 18:22:06 -0000 1.64
@@ -1,15 +1,13 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 3.0
-Release: 0.devel2.2%{?dist}.1
-Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel2.tar.bz2
+Release: 0.devel3.1%{?dist}
+Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel3.tar.bz2
Source1: mdmonitor.init
-Source2: mdadm.rules
-Patch1: mdadm-3.0-udev.patch
-Patch2: mdadm-3.0-warn.patch
-Patch3: mdadm-2.5.2-static.patch
-Patch4: mdadm-3.0-alias.patch
-Patch5: mdadm-3.0-cast.patch
+Source2: raid-check
+Patch1: mdadm-2.5.2-static.patch
+Patch2: mdadm-3.0-cast.patch
+Patch3: mdadm-3.0-incremental.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+
Group: System Environment/Base
@@ -18,6 +16,7 @@
Requires(post): /sbin/service, /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
+Requires: udev
BuildRequires: glibc-static
%description
@@ -28,24 +27,20 @@
file can be used to help with some common tasks.
%prep
-%setup -q -n mdadm-3.0-devel2
-%patch1 -p1 -b .udev
-%patch2 -p1 -b .warn
-%patch3 -p1 -b .static
-%patch4 -p1 -b .alias
-%patch5 -p1 -b .cast
+%setup -q -n mdadm-3.0-devel3
+%patch1 -p1 -b .static
+%patch2 -p1 -b .cast
+%patch3 -p1 -b .incremental
%build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
%install
rm -rf $RPM_BUILD_ROOT
-install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/70-mdadm-assemble.rules
+install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
+install -Dp -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/raid-check
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install-static
mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
-rm -f $RPM_BUILD_ROOT/etc/udev/rules.d/64-*.rules
%clean
rm -rf $RPM_BUILD_ROOT
@@ -77,13 +72,24 @@
%files
%defattr(-,root,root,-)
%doc TODO ChangeLog mdadm.conf-example COPYING misc/*
-/etc/udev/rules.d/*
+/lib/udev/rules.d/*
/sbin/*
%{_initrddir}/*
%{_mandir}/man*/md*
+%{_sysconfdir}/cron.weekly/*
%attr(0700,root,root) %dir /var/run/mdadm
%changelog
+* Tue Mar 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.1
+- Update to latest devel release
+- Remove the no longer necessary udev patch
+- Remove the no longer necessary warn patch
+- Remove the no longer necessary alias patch
+- Update the mdadm.rules file to only pay attention to device adds, not
+ changes and to enable incremental assembly
+- Add a cron job to run a weekly repair of the array to correct bad sectors
+- Resolves: bz474436, bz490972
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-0.devel2.2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 12 Feb 2009 15:10:22 -0000 1.22
+++ sources 18 Mar 2009 18:22:06 -0000 1.23
@@ -1 +1 @@
-3dec65da9f71d6ef9fbd2e8f06828703 mdadm-3.0-devel2.tar.bz2
+8cf5b1abb20b2bc33a2bd4b1afbae814 mdadm-3.0-devel3.tar.bz2
--- mdadm-3.0-alias.patch DELETED ---
--- mdadm-3.0-udev.patch DELETED ---
--- mdadm-3.0-warn.patch DELETED ---
--- mdadm.rules DELETED ---
More information about the fedora-extras-commits
mailing list