- 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
This commit is contained in:
parent
7e22e636df
commit
7e3c782e9c
46
mdadm.spec
46
mdadm.spec
@ -1,19 +1,12 @@
|
|||||||
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
||||||
Name: mdadm
|
Name: mdadm
|
||||||
Version: 2.6.7.1
|
Version: 3.0
|
||||||
Release: 1%{?dist}
|
Release: 0.devel2.1%{?dist}
|
||||||
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
|
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel2.tar.bz2
|
||||||
Source1: mdmonitor.init
|
Source1: mdmonitor.init
|
||||||
Source2: mdadm.rules
|
Patch1: mdadm-3.0-udev.patch
|
||||||
Patch1: mdadm-2.5.2-s390-build.patch
|
Patch2: mdadm-3.0-warn.patch
|
||||||
Patch2: mdadm-2.5.2-static.patch
|
Patch3: 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/
|
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -31,27 +24,19 @@ almost all functions without a configuration file, though a configuration
|
|||||||
file can be used to help with some common tasks.
|
file can be used to help with some common tasks.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -n mdadm-3.0-devel2
|
||||||
%patch1 -p1 -b .s390
|
%patch1 -p1 -b .udev
|
||||||
%patch2 -p1 -b .static
|
%patch2 -p1 -b .warn
|
||||||
%patch3 -p1 -b .nodiet
|
%patch3 -p1 -b .static
|
||||||
%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
|
%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
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install
|
|
||||||
install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
|
install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
|
||||||
mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
|
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
|
mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@ -91,6 +76,13 @@ fi
|
|||||||
%attr(0700,root,root) %dir /var/run/mdadm
|
%attr(0700,root,root) %dir /var/run/mdadm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 12 2009 Doug Ledford <dledford@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@redhat.com> - 2.6.7.1-1
|
* Fri Oct 24 2008 Doug Ledford <dledford@redhat.com> - 2.6.7.1-1
|
||||||
- Updated to latest upstream stable release (#466803)
|
- Updated to latest upstream stable release (#466803)
|
||||||
- Change udev rule to not assemble degraded arrays (#453314)
|
- Change udev rule to not assemble degraded arrays (#453314)
|
||||||
|
Loading…
Reference in New Issue
Block a user