[packages/mdadm] - rel 4; build mdassemble separately and turn on MDASSEMBLE_AUTO, so we get working mdassemble

arekm arekm at pld-linux.org
Sat Feb 1 16:31:18 CET 2014


commit d8df6751bd99f22aba9226bddd1e57c68b518430
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Feb 1 16:31:16 2014 +0100

    - rel 4; build mdassemble separately and turn on MDASSEMBLE_AUTO, so we get working mdassemble

 mdadm.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/mdadm.spec b/mdadm.spec
index be8848e..441fa87 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -8,7 +8,7 @@ Summary:	Tool for creating and maintaining software RAID devices
 Summary(pl.UTF-8):	Narzędzie do tworzenia i obsługi programowych macierzy RAID
 Name:		mdadm
 Version:	3.3
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
@@ -95,7 +95,16 @@ mv -f mdadm.static initrd-mdadm
 %{__make} clean
 %endif
 
-%{__make} all mdassemble mdadm.8 \
+%{__make} mdassemble \
+	MDASSEMBLE_AUTO=1 \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+	LDFLAGS="%{rpmldflags}" \
+	SYSCONFDIR="%{_sysconfdir}"
+mv mdassemble regular-mdassemble
+%{__make} clean
+
+%{__make} all mdadm mdadm.8 \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 	LDFLAGS="%{rpmldflags}" \
@@ -114,7 +123,7 @@ install initrd-mdassemble $RPM_BUILD_ROOT%{_libdir}/initrd/mdassemble
 ln -s mdadm $RPM_BUILD_ROOT%{_libdir}/initrd/mdctl
 %endif
 
-install mdassemble $RPM_BUILD_ROOT%{_sbindir}
+install regular-mdassemble $RPM_BUILD_ROOT%{_sbindir}/mdassemble
 install mdadm $RPM_BUILD_ROOT%{_sbindir}
 
 install md*.5 $RPM_BUILD_ROOT%{_mandir}/man5
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mdadm.git/commitdiff/d8df6751bd99f22aba9226bddd1e57c68b518430



More information about the pld-cvs-commit mailing list