Build/install mdassemble #211426 by Jimmy Jazz.

Package-Manager: portage-2.2_pre5

4 files changed, 88 insertions, 5 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index da8415c36cd9..427d38cb13f0 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.94 2008/03/17 07:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.95 2008/03/29 19:21:33 vapier Exp $
+
+*mdadm-2.6.4-r2 (29 Mar 2008)
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/mdadm-2.6.4-mdassemble.patch, +mdadm-2.6.4-r2.ebuild:
+  Build/install mdassemble #211426 by Jimmy Jazz.
 
   17 Mar 2008; Mike Frysinger <vapier@gentoo.org> mdadm-2.6.4-r1.ebuild:
   Install more docs #213646 by Conway S. Smith.
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 68b5eb0f14ce..abf43345a3cd 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX 64-md-raid.rules-2.6.3-r2 738 RMD160 95f8934aded76f5b85e5f2ff9f9f250f8c4a4300 SHA1 4c4a103fd8ed7134f8b86b1f7d2f4f6cf439184e SHA256 9ad68b9efc5bf7785c1a5cc4b49568f54b25ad0b9783a7642e60a131ef238f3b
 AUX mdadm-1.9.0-dont-make-man.patch 260 RMD160 439a95518c7890bf72ef463ec274c53437f4ac5e SHA1 b40ab96938d0a0d80a25d67fc263c94c76749269 SHA256 71c81dbbfa1d466e9ee2d3ff0afa8b2d57e75be5dbccdbdd837786723943f7cd
 AUX mdadm-2.6-syslog-updates.patch 1117 RMD160 c7de674fc76eb444d1d5f97a5a4c59c955aa51b6 SHA1 c00f4f283acd226241aed07e35133f965bb8b154 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86
+AUX mdadm-2.6.4-mdassemble.patch 465 RMD160 4abcfcd75242d552f674a850ea116835a8f56aea SHA1 609161b594c51644f30de98a7a74473361bdb98b SHA256 015321cbb219f80444c9d56d01bde36f828d2814c57712a7655bdbae811ff8c4
 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79
 AUX mdadm.rc 574 RMD160 69640d0b1fbd11bd7078c0e7791d247420653b73 SHA1 39044e7d6ad63c44669baf9775230670f04b201c SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7
 AUX mdraid.rc 616 RMD160 641fec8593582abd37a2da203328651d25cb533f SHA1 4c4daae5e84f1e5f60d826845a094ed61b9e0443 SHA256 a4dc3068ba0c8ebbb05a5c03bfec24c4e1f67e007fa2e8ff9d21dce5ab37b1e6
@@ -25,13 +26,14 @@ EBUILD mdadm-2.6.3-r3.ebuild 1832 RMD160 95dc27da94a6d1143a9025b69acac9ef657557b
 EBUILD mdadm-2.6.3-r4.ebuild 1833 RMD160 78519c3d4710e1c6628415916b748b8099244abb SHA1 a6b4c7bb1713f7b2a48ee2638f94ca7c6191d75c SHA256 02361f63ce5c1db0139bfba54a6db426f58fc5232c96141d3c6b7255b1a1b03c
 EBUILD mdadm-2.6.3.ebuild 1247 RMD160 f53ae47db3ee0540384c848adf1828127372f71f SHA1 ffab0c6351454cef193582f598a977a37661a2e4 SHA256 460b31566602f886f18593598edd0a11278caaba12aa069a7b6dc515981026d8
 EBUILD mdadm-2.6.4-r1.ebuild 1835 RMD160 f718bb489cbded25f410140deb751ce5541ef9b9 SHA1 5876fc092ed95c37d708b0ba07cccf13b0d92511 SHA256 263d95c13d0714403fd3de37cdcba36eb105b931ca76759a82dd238b8bb10a96
+EBUILD mdadm-2.6.4-r2.ebuild 1952 RMD160 12c1d6d62bf8fcae0916e6ea3caa2701522b1315 SHA1 a3c425a3e39821801ba2d12a47a911cb676d2833 SHA256 c046744e777c09afefb648459b2154b29dfbed4073ba1e0fc58338ed449dc2f9
 EBUILD mdadm-2.6.4.ebuild 1816 RMD160 41833b3875a129fe244552c9be722c6114cbb250 SHA1 5e116dec286bcccf1eb0839d317edbfe85af84d8 SHA256 f16ae9f4454234b8e5e31d16ba177f39c67333a59098b182db4ba7dfdc37311a
-MISC ChangeLog 14998 RMD160 b47047e209fad441f22a34857a9aeb8338e0211e SHA1 ae69045ba1d1a995094f9bc6b7db13bbe15b0efa SHA256 0e9d7a14a72109c481998acbe686a62200107b2856e61e46eb471bd7791a121b
+MISC ChangeLog 15193 RMD160 e8756a733afe62e43b84baad638a9c97c426efcb SHA1 eceda76f98074272a862732ccd2470530a811e48 SHA256 204d23f9caf7ea60c093f095a7127790c15ff2d344e7aa3022227d8ba1a53125
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH3iLYj9hvisErhMIRAg4GAKCuN85NH4aHwBPiOxfQ4463fzLFxwCfaDEF
-kwBAF0J3cxCJkuTwnZYJlKo=
-=vom/
+iD8DBQFH7pePj9hvisErhMIRAv+xAJ93UpTWMzYa8iIRBNKH66IpRw/VGQCeI2el
+mmcCJKyfFH46pxV6ga9BDmw=
+=/zPm
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/mdadm-2.6.4-mdassemble.patch b/sys-fs/mdadm/files/mdadm-2.6.4-mdassemble.patch
new file mode 100644
index 000000000000..69f35c99f3b7
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.6.4-mdassemble.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/211426
+
+make default mdassemble sane
+
+--- Makefile
++++ Makefile
+@@ -121,8 +121,7 @@
+ 	$(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
+ 
+ mdassemble : $(ASSEMBLE_SRCS) mdadm.h
+-	rm -f $(OBJS)
+-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
++	$(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
+ 
+ mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h
+ 	rm -f $(OBJS)
diff --git a/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild b/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild
new file mode 100644
index 000000000000..391bbd956edd
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild,v 1.1 2008/03/29 19:21:33 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://neil.brown.name/blog/mdadm"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		all mdassemble \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	into /
+	dosbin mdassemble || die
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-2.6.4 raid-start.sh || die "addon failed"
+	newexe "${FILESDIR}"/raid-stop.sh-2.6.3-r2 raid-stop.sh || die "addon failed"
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die "installing mdadm.rc failed"
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die "installing mdadm.confd failed"
+	newinitd "${FILESDIR}"/mdraid.rc-2.6.3-r4 mdraid || die "installing mdraid.rc failed"
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-md-raid.rules-2.6.3-r2 64-md-raid.rules || die
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}