rpms/mdadm/F-10 .cvsignore, 1.21, 1.22 mdadm-2.6.1-build.patch, 1.4, 1.5 mdadm.rules, 1.3, 1.4 mdadm.spec, 1.55, 1.56 sources, 1.21, 1.22 mdadm-2.6.4-open.patch, 1.1, NONE mdadm-2.6.7.1-metadata.patch, 1.1, NONE mdadm-2.6.7.1-partitionable.patch, 1.1, NONE mdadm-2.6.7.1-raid10-incremental.patch, 1.1, NONE

Mon Jun 29 20:05:37 UTC 2009

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25479

Modified Files:
	.cvsignore mdadm-2.6.1-build.patch mdadm.rules mdadm.spec 
	sources 
Removed Files:
	mdadm-2.6.4-open.patch mdadm-2.6.7.1-metadata.patch 
	mdadm-2.6.7.1-partitionable.patch 
	mdadm-2.6.7.1-raid10-incremental.patch 
Log Message:
* Mon Jun 29 2009 Doug Ledford <dledford at redhat.com> - 2.6.9-1
- Update to last 2.6 series stable release (#493011, #481561)
- Fix incremental assembly udev rules file (#507909, #471741)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22

--- .cvsignore	29 Oct 2008 18:31:09 -0000	1.21
+++ .cvsignore	29 Jun 2009 20:05:06 -0000	1.22
@@ -10,3 +10,4 @@ mdadm-2.6.2.tgz
 mdadm-2.6.4.tgz
 mdadm-2.6.7.tar.bz2
 mdadm-2.6.7.1.tar.bz2
+mdadm-2.6.9.tar.bz2

mdadm-2.6.1-build.patch:

Index: mdadm-2.6.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-10/mdadm-2.6.1-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mdadm-2.6.1-build.patch	29 Oct 2008 18:31:09 -0000	1.4
+++ mdadm-2.6.1-build.patch	29 Jun 2009 20:05:06 -0000	1.5
@@ -1,23 +1,19 @@
---- mdadm-2.6.7/Makefile.build	2008-06-26 19:23:12.000000000 -0400
-+++ mdadm-2.6.7/Makefile	2008-06-26 19:31:56.000000000 -0400
-@@ -104,13 +104,15 @@ mdadm.static : $(OBJS) $(STATICOBJS)
+--- mdadm-2.6.9/Makefile.build	2009-06-29 15:53:55.119919813 -0400
++++ mdadm-2.6.9/Makefile	2009-06-29 15:56:31.843668819 -0400
+@@ -107,10 +107,11 @@
  	$(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
  
  mdadm.tcc : $(SRCS) mdadm.h
 +	rm -f $(OBJS) $(STATICOBJS)
  	$(TCC) -o mdadm.tcc $(SRCS)
  
- dadm.uclibc : $(SRCS) mdadm.h
-+	rm -f $(OBJS) $(STATICOBJS)
- 	$(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) $(STATICSRC)
- 
  mdadm.klibc : $(SRCS) mdadm.h
 -	rm -f $(OBJS) 
-+	rm -f $(OBJS)  $(STATICOBJS)
++	rm -f $(OBJS) $(STATICOBJS)
  	gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS)
  
  mdadm.Os : $(SRCS) mdadm.h
-@@ -122,12 +124,12 @@ mdadm.O2 : $(SRCS) mdadm.h
+@@ -122,12 +123,12 @@
  test_stripe : restripe.c mdadm.h
  	$(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
  
@@ -35,7 +31,7 @@
  	$(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
  
  mdassemble.auto : $(ASSEMBLE_SRCS) mdadm.h $(ASSEMBLE_AUTO_SRCS)
-@@ -135,8 +137,8 @@ mdassemble.auto : $(ASSEMBLE_SRCS) mdadm
+@@ -135,8 +136,8 @@
  	$(MAKE) MDASSEMBLE_AUTO=1 mdassemble.static
  	mv mdassemble.static mdassemble.auto
  
@@ -46,7 +42,7 @@
  	$(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)
  
  # This doesn't work
-@@ -161,8 +163,9 @@ $(OBJS) : mdadm.h bitmap.h
+@@ -161,8 +162,9 @@
  sha1.o : sha1.c sha1.h md5.h
  	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
  
@@ -57,7 +53,7 @@
  	$(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static
  	$(INSTALL) -D -m 755 mdassemble.static $(DESTDIR)$(BINDIR)/mdassemble.static
  
-@@ -179,10 +182,10 @@ install-klibc : mdadm.klibc install-man
+@@ -179,10 +181,10 @@
  	$(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
  
  install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5


Index: mdadm.rules
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-10/mdadm.rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mdadm.rules	29 Oct 2008 18:31:10 -0000	1.3
+++ mdadm.rules	29 Jun 2009 20:05:06 -0000	1.4
@@ -2,5 +2,7 @@
 # automatically cause mdadm to be run.
 # See udev(8) for syntax
 
-SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid*", \
-	RUN+="/sbin/mdadm -I --auto=yes $root/%k"
+SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
+	IMPORT{program}="/sbin/mdadm --examine --export $tempnode", \
+	RUN+="/bin/bash -c '[ ! -f /dev/.in_sysinit ] && mdadm -I $env{DEVNAME}'"
+


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-10/mdadm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- mdadm.spec	29 Oct 2008 18:31:10 -0000	1.55
+++ mdadm.spec	29 Jun 2009 20:05:06 -0000	1.56
@@ -1,6 +1,6 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     2.6.7.1
+Version:     2.6.9
 Release:     1%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
@@ -10,10 +10,6 @@ Patch2:      mdadm-2.5.2-static.patch
 Patch3:      mdadm-2.2-nodiet.patch
 Patch4:      mdadm-2.5.2-cflags.patch
 Patch5:      mdadm-2.6.1-build.patch
-Patch6:      mdadm-2.6.4-open.patch
-Patch7:      mdadm-2.6.7.1-metadata.patch
-Patch8:      mdadm-2.6.7.1-raid10-incremental.patch
-Patch9:      mdadm-2.6.7.1-partitionable.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -37,20 +33,16 @@ file can be used to help with some commo
 %patch3 -p1 -b .nodiet
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .build
-%patch6 -p1 -b .open
-%patch7 -p1 -b .metadata
-%patch8 -p1 -b .incremental
-%patch9 -p1 -b .partitionable
 
 %build
-make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
+make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install
 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.rules
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/65-md-incremental.rules
 
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
 
@@ -91,6 +83,10 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Jun 29 2009 Doug Ledford <dledford at redhat.com> - 2.6.9-1
+- Update to last 2.6 series stable release (#493011, #481561)
+- Fix incremental assembly udev rules file (#507909, #471741)
+
 * Fri Oct 24 2008 Doug Ledford <dledford at redhat.com> - 2.6.7.1-1
 - Updated to latest upstream stable release (#466803)
 - Change udev rule to not assemble degraded arrays (#453314)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Oct 2008 18:31:10 -0000	1.21
+++ sources	29 Jun 2009 20:05:06 -0000	1.22
@@ -1 +1 @@
-9e8d4744985c8b7e92f748e743b7d2a3  mdadm-2.6.7.1.tar.bz2
+96c1bcac1699ba1aa70dfd04a08549c9  mdadm-2.6.9.tar.bz2


--- mdadm-2.6.4-open.patch DELETED ---


--- mdadm-2.6.7.1-metadata.patch DELETED ---


--- mdadm-2.6.7.1-partitionable.patch DELETED ---


--- mdadm-2.6.7.1-raid10-incremental.patch DELETED ---


