diff options
| -rw-r--r-- | sys-fs/mdadm/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-fs/mdadm/files/mdraid.rc-3.1.1 | 40 | ||||
| -rw-r--r-- | sys-fs/mdadm/mdadm-3.1.1-r1.ebuild | 64 |
3 files changed, 112 insertions, 2 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog index 3673ceaee77a..ea2386f78266 100644 --- a/sys-fs/mdadm/ChangeLog +++ b/sys-fs/mdadm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/mdadm -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.127 2009/12/07 11:18:36 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.128 2010/01/24 22:20:56 robbat2 Exp $ + +*mdadm-3.1.1-r1 (24 Jan 2010) + + 24 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +files/mdraid.rc-3.1.1, + +mdadm-3.1.1-r1.ebuild: + Bug #251730: Fix up start/stop_addon usage for BL2. 07 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.0.ebuild: amd64 stable wrt #287013 diff --git a/sys-fs/mdadm/files/mdraid.rc-3.1.1 b/sys-fs/mdadm/files/mdraid.rc-3.1.1 new file mode 100644 index 000000000000..571c83f82204 --- /dev/null +++ b/sys-fs/mdadm/files/mdraid.rc-3.1.1 @@ -0,0 +1,40 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc-3.1.1,v 1.1 2010/01/24 22:20:57 robbat2 Exp $ + +depend() { + if [ ! -e /sbin/functions.sh ] ; then + # on baselayout-1 this could cause + # dependency-cycles with checkroot (before *) + before checkfs fsck + after modules + fi +} + +run_addon() { + local f=/lib/rcscripts/addons/$1.sh + if [ -r "$f" ]; then + ( . "$f" ) + fi +} +start_addon() { + run_addon "$1"-start +} +stop_addon() { + run_addon "$1"-stop +} + +start() { + if [ -e /sbin/functions.sh ] ; then + eerror "The ${SVCNAME} init script is written for baselayout-2" + eerror "Please do not use it with baselayout-1" + return 1 + fi + + start_addon raid +} + +stop() { + stop_addon raid +} diff --git a/sys-fs/mdadm/mdadm-3.1.1-r1.ebuild b/sys-fs/mdadm/mdadm-3.1.1-r1.ebuild new file mode 100644 index 000000000000..5793e6cb3e90 --- /dev/null +++ b/sys-fs/mdadm/mdadm-3.1.1-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.1.1-r1.ebuild,v 1.1 2010/01/24 22:20:56 robbat2 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" + +DEPEND="" +RDEPEND=">=sys-apps/util-linux-2.16" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.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-3.0 raid-start.sh || die "addon failed" + newexe "${FILESDIR}"/raid-stop.sh 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-3.1.1 mdraid || die "installing mdraid.rc failed" + + # do not rely on /lib -> /libXX link + sed -i \ + -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" \ + "${D}"/etc/init.d/* +} + +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" +} |