rpms/mdadm/devel .cvsignore, 1.21, 1.22 mdadm-2.5.2-static.patch, 1.3, 1.4 mdadm.spec, 1.55, 1.56 sources, 1.21, 1.22 mdadm-2.2-nodiet.patch, 1.1, NONE mdadm-2.5.2-cflags.patch, 1.2, NONE mdadm-2.5.2-s390-build.patch, 1.1, NONE mdadm-2.6.1-build.patch, 1.4, NONE mdadm-2.6.4-incremental.patch, 1.1, NONE 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 mdadm.rules, 1.3, NONE
Doug Ledford
dledford at fedoraproject.org
Thu Feb 12 15:10:53 UTC 2009
- Previous message: rpms/htdig/devel .cvsignore, 1.10, 1.11 htdig.spec, 1.48, 1.49 sources, 1.11, 1.12
- Next message: rpms/mdadm/devel mdadm-3.0-udev.patch, NONE, 1.1 mdadm-3.0-warn.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dledford
Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1517
Modified Files:
.cvsignore mdadm-2.5.2-static.patch mdadm.spec sources
Removed Files:
mdadm-2.2-nodiet.patch mdadm-2.5.2-cflags.patch
mdadm-2.5.2-s390-build.patch mdadm-2.6.1-build.patch
mdadm-2.6.4-incremental.patch 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 mdadm.rules
Log Message:
* Thu Feb 12 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.1
- Update to latest upstream devel release
- Use the udev rules file included with mdadm instead of our own
- Drop all the no longer relevant patches
- Fix a build error in mdopen.c
- Fix the udev rules path in Makefile
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 29 Oct 2008 18:31:09 -0000 1.21
+++ .cvsignore 12 Feb 2009 15:10:22 -0000 1.22
@@ -10,3 +10,4 @@
mdadm-2.6.4.tgz
mdadm-2.6.7.tar.bz2
mdadm-2.6.7.1.tar.bz2
+mdadm-3.0-devel2.tar.bz2
mdadm-2.5.2-static.patch:
Index: mdadm-2.5.2-static.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm-2.5.2-static.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mdadm-2.5.2-static.patch 31 Mar 2007 13:45:58 -0000 1.3
+++ mdadm-2.5.2-static.patch 12 Feb 2009 15:10:22 -0000 1.4
@@ -1,36 +1,24 @@
---- mdadm-2.6.1/Makefile.static 2007-03-31 09:43:56.000000000 -0400
-+++ mdadm-2.6.1/Makefile 2007-03-31 09:44:32.000000000 -0400
-@@ -146,23 +146,26 @@ $(OBJS) : mdadm.h bitmap.h
- sha1.o : sha1.c sha1.h md5.h
- $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
-
--install : mdadm install-man
-- $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
-+install : mdadm mdadm.static mdassemble.static install-man
-+ $(INSTALL) -D -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
-+ $(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static
-+ $(INSTALL) -D -m 755 mdassemble.static $(DESTDIR)$(BINDIR)/mdassemble.static
+Binary files mdadm-3.0-devel2/mdadm.static and mdadm-3.0-devel2/mdadm differ
+--- mdadm-3.0-devel2/Makefile.static 2009-02-12 09:58:36.000000000 -0500
++++ mdadm-3.0-devel2/Makefile 2009-02-12 09:59:22.000000000 -0500
+@@ -183,16 +183,16 @@ sha1.o : sha1.c sha1.h md5.h
+ $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
install-static : mdadm.static install-man
- $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
-+ $(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
++ $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static
install-tcc : mdadm.tcc install-man
- $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
-+ $(INSTALL) -D -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
++ $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm.tcc
install-uclibc : mdadm.uclibc install-man
- $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
-+ $(INSTALL) -D -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
++ $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm.uclibc
install-klibc : mdadm.klibc install-man
- $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
-+ $(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
++ $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm.klibc
--install-man: mdadm.8 md.4 mdadm.conf.5
-+install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5
+ install-man: mdadm.8 md.4 mdadm.conf.5
$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
-+ $(INSTALL) -D -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8
- $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
- $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
-
Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mdadm.spec 29 Oct 2008 18:31:10 -0000 1.55
+++ mdadm.spec 12 Feb 2009 15:10:22 -0000 1.56
@@ -1,19 +1,12 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
-Version: 2.6.7.1
-Release: 1%{?dist}
-Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
+Version: 3.0
+Release: 0.devel2.1%{?dist}
+Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel2.tar.bz2
Source1: mdmonitor.init
-Source2: mdadm.rules
-Patch1: mdadm-2.5.2-s390-build.patch
-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
+Patch1: mdadm-3.0-udev.patch
+Patch2: mdadm-3.0-warn.patch
+Patch3: mdadm-2.5.2-static.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+
Group: System Environment/Base
@@ -31,27 +24,19 @@
file can be used to help with some common tasks.
%prep
-%setup -q
-%patch1 -p1 -b .s390
-%patch2 -p1 -b .static
-%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
+%setup -q -n mdadm-3.0-devel2
+%patch1 -p1 -b .udev
+%patch2 -p1 -b .warn
+%patch3 -p1 -b .static
%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" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
%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
-
+make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install-static
mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
%clean
@@ -91,6 +76,13 @@
%attr(0700,root,root) %dir /var/run/mdadm
%changelog
+* Thu Feb 12 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.1
+- Update to latest upstream devel release
+- Use the udev rules file included with mdadm instead of our own
+- Drop all the no longer relevant patches
+- Fix a build error in mdopen.c
+- Fix the udev rules path in Makefile
+
* 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/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 29 Oct 2008 18:31:10 -0000 1.21
+++ sources 12 Feb 2009 15:10:22 -0000 1.22
@@ -1 +1 @@
-9e8d4744985c8b7e92f748e743b7d2a3 mdadm-2.6.7.1.tar.bz2
+3dec65da9f71d6ef9fbd2e8f06828703 mdadm-3.0-devel2.tar.bz2
--- mdadm-2.2-nodiet.patch DELETED ---
--- mdadm-2.5.2-cflags.patch DELETED ---
--- mdadm-2.5.2-s390-build.patch DELETED ---
--- mdadm-2.6.1-build.patch DELETED ---
--- mdadm-2.6.4-incremental.patch DELETED ---
--- 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 ---
--- mdadm.rules DELETED ---
- Previous message: rpms/htdig/devel .cvsignore, 1.10, 1.11 htdig.spec, 1.48, 1.49 sources, 1.11, 1.12
- Next message: rpms/mdadm/devel mdadm-3.0-udev.patch, NONE, 1.1 mdadm-3.0-warn.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list