diff --git a/.cvsignore b/.cvsignore index cbba0df..14beb00 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ mdmpd-0.4.tgz mdadm-2.2.tar.bz2 mdadm-2.3.1.tgz +mdadm-2.5.2.tar.bz2 diff --git a/mdadm-2.5.2-cflags.patch b/mdadm-2.5.2-cflags.patch new file mode 100644 index 0000000..e487260 --- /dev/null +++ b/mdadm-2.5.2-cflags.patch @@ -0,0 +1,24 @@ +--- mdadm-2.5.2/Makefile.cflags 2006-07-07 15:00:32.000000000 -0400 ++++ mdadm-2.5.2/Makefile 2006-07-07 15:02:09.000000000 -0400 +@@ -89,10 +89,10 @@ everything: all mdadm.static mdadm.uclib + # mdadm.tcc doesn't work.. + + mdadm : $(OBJS) +- $(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS) + + mdadm.static : $(OBJS) $(STATICOBJS) +- $(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS) + + mdadm.tcc : $(SRCS) mdadm.h + $(TCC) -o mdadm.tcc $(SRCS) +@@ -113,7 +113,7 @@ mdassemble : $(ASSEMBLE_SRCS) mdadm.h + + mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h + rm -f $(OBJS) +- $(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC) ++ $(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC) + + mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h + rm -f $(OJS) diff --git a/mdadm-2.5.2-s390-build.patch b/mdadm-2.5.2-s390-build.patch new file mode 100644 index 0000000..93f84ad --- /dev/null +++ b/mdadm-2.5.2-s390-build.patch @@ -0,0 +1,11 @@ +--- mdadm-2.5.2/Makefile.s390 2006-06-19 20:01:17.000000000 -0400 ++++ mdadm-2.5.2/Makefile 2006-07-07 14:11:23.000000000 -0400 +@@ -39,7 +39,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes ++CWFLAGS = -Wall -Wstrict-prototypes + + ifdef DEBIAN + CPPFLAGS= -DDEBIAN diff --git a/mdadm-2.5.2-static.patch b/mdadm-2.5.2-static.patch new file mode 100644 index 0000000..57214b7 --- /dev/null +++ b/mdadm-2.5.2-static.patch @@ -0,0 +1,31 @@ +--- mdadm-2.5.2/Makefile.static 2006-07-07 14:12:20.000000000 -0400 ++++ mdadm-2.5.2/Makefile 2006-07-07 14:17:54.000000000 -0400 +@@ -141,20 +141,22 @@ $(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 + + 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-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-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-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-man: mdadm.8 md.4 mdadm.conf.5 + $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 diff --git a/mdadm.spec b/mdadm.spec index 33b5a13..fd22364 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,20 +1,20 @@ Summary: mdadm controls Linux md devices (software RAID arrays) Name: mdadm -Version: 2.3.1 -Release: 3 -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tgz +Version: 2.5.2 +Release: 1 +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source1: mdmonitor.init Source2: mdmpd-0.4.tgz Source3: mdmpd.init Source4: mdassemble.8 Patch: mdadm-1.5.0-email.patch -Patch2: mdadm-1.9.0-s390-build.patch -Patch3: mdadm-1.9.0-static-make.patch -Patch4: mdadm-1.11.0-default-auto.patch +Patch1: mdmpd-0.4-node.patch +Patch2: mdadm-2.5.2-s390-build.patch +Patch3: mdadm-2.5.2-static.patch Patch5: mdadm-2.2-nodiet.patch -Patch6: mdadm-2.3.1-cflags.patch +Patch6: mdadm-2.5.2-cflags.patch Patch7: mdadm-2.3.1-fswab64.patch -URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPL Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-root @@ -31,19 +31,19 @@ file can be used to help with some common tasks. %prep %setup -q -a 2 %patch -p1 -b .email +%patch1 -p1 -b .node %patch2 -p1 -b .s390 %patch3 -p1 -b .static -%patch4 -p1 -b .auto %patch5 -p1 -b .nodiet %patch6 -p1 -b .cflags -%patch7 -p1 -b .fswab64 +#%patch7 -p1 -b .fswab64 %build -make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdadm.static mdassemble.static +make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdadm mdadm.static mdassemble.static make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd %install -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install.mdadmstatic install.mdassemble +make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd @@ -87,6 +87,10 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Fri Jul 7 2006 Doug Ledford - 2.5.2-1 +- Update to 2.5.2 +- Remove auto default patch as upstream now has a preferred default auto method + * Wed Mar 8 2006 Peter Jones - 2.3.1-3 - fix build on ppc64 diff --git a/sources b/sources index 60ed8b5..b7e362e 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ d173fc81f2cc11cb84522fac63e876f1 mdmpd-0.4.tgz -c8df672f809aa4a43a88a2516d421d6e mdadm-2.2.tar.bz2 -3fef2abf76cf019286db5c465619e39d mdadm-2.3.1.tgz +f95d58d3ce8d43c628345d76197ce97b mdadm-2.5.2.tar.bz2