Bug #251730: Fix up start/stop_addon usage for BL2.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 115 insertions, 3 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/Manifest b/sys-fs/mdadm/Manifest
index 192f0b494f4b..78969dbfd8f9 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -8,6 +8,7 @@ AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d7537
 AUX mdadm.rc 574 RMD160 69640d0b1fbd11bd7078c0e7791d247420653b73 SHA1 39044e7d6ad63c44669baf9775230670f04b201c SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7
 AUX mdraid.rc 637 RMD160 64741e62695e9dbefba5dcef37137e93d621f5e6 SHA1 c443e5cb47359b307515d942ca3d6b713b4f2244 SHA256 55c37752aa34db35bc36f566b0f093e21022ee9ae9dd11465e472d192a8631d2
 AUX mdraid.rc-2.6.3-r4 637 RMD160 6cd883833e8327256b61567eef3372c0b539824f SHA1 083569014fad29efdf23ca5522163cec31623853 SHA256 c460a68a9ceed95d9ddd3c862c0c58f482a289e074c37dc6ab82f564e04f70ec
+AUX mdraid.rc-3.1.1 815 RMD160 df283e9b55ba6df3ac209861e18c3197ede51885 SHA1 a34072a43037ec9f8c4bc858660bb261a6dfff1d SHA256 95f759ba9d4f719bb5122546fdcce18dd9b0060df1296cf8ae17a04137e163e2
 AUX raid-start.sh 1445 RMD160 6c210b05103376ea0e6d9c251ef8cc3b7b74957f SHA1 dda9e22d1fa9ed9dd5d27dbb635bbaba71263893 SHA256 73161840031941f178d6e3cab3880ae8919128e4b2adeffee97fa3401c7ffbc2
 AUX raid-start.sh-2.6.4 1470 RMD160 c779e6f5ff5fb74c46c8d590a87bc07d97f21943 SHA1 4cd319c799b2ff9c186b89d16a80da64506e7b02 SHA256 f9a65d5947053bc7c6930f2b011b7e4b3a37f1f390beac7a72f0ac3a54d0d174
 AUX raid-start.sh-3.0 982 RMD160 b697978ebd9c60ac17566504491a705ba1523700 SHA1 c8c753e750f62b4ebcc079a039468920a7a777b9 SHA256 529d3ba73bf23944e4ca12f0b311c6bfb30e3bb4ff90ad906e1ae3b3419e33c2
@@ -26,6 +27,7 @@ EBUILD mdadm-3.0.2-r1.ebuild 2059 RMD160 67abd4c018d55b94cb69b3323f08cf13dd61f61
 EBUILD mdadm-3.0.2.ebuild 1975 RMD160 d8b2199b759aa74172d52c40cfb14818a590b13e SHA1 29e6a861feceaec8a90c5cedcf8ea2c1d0c26e2c SHA256 9b4c524887dcf527f0ddd8a29fc9e7f7b3b7cbcefb83dda0a9f9bfd403b698ac
 EBUILD mdadm-3.0.3.ebuild 1975 RMD160 5cf4714e6e15910176a14d056ad15fba05176953 SHA1 d8d7faf8646ab3bcc6869016100a82e28408f128 SHA256 b91f78defd6bd829e111393b77460fd31ff57e11b47488de0d093f88964f8ef1
 EBUILD mdadm-3.0.ebuild 1968 RMD160 93afe16145d58cffa6d932a5bec8fddf096f83d5 SHA1 863bb788ec8dc00b080e871b850efe9ed4fa1703 SHA256 945e0772db90a7e48f03fa0f862f4fd99358fe4c7330ad313d0bd3372a7628bb
+EBUILD mdadm-3.1.1-r1.ebuild 2009 RMD160 89d4f4a29ce1224ce16e6bc46c92ca475e3ce778 SHA1 1668f1d1abe0d8829b6f5a3740b526b8e44241c3 SHA256 06aa02c67ba0187d846c7d5c1034c689355fe9e8f03b78397d58338aca821142
 EBUILD mdadm-3.1.1.ebuild 1874 RMD160 604fc39346e68886875e6e6ddf00eb72697a0c22 SHA1 48643e9039101832e3c040d8254f476c23fbc1d2 SHA256 179b9a58eb6e8b0c9725c17a4964a1c1fb43017a153c35cf88fada6f5bdc6169
-MISC ChangeLog 19690 RMD160 49271e51bca29b9d6419f544b723bb87ba899146 SHA1 87862a004ac98071ef24863e8bdd55b53e997a1a SHA256 17767ec128f6fdf7da3d01e33233a57e97d4484f1d2086e1cb01e9aff52c31bc
+MISC ChangeLog 19877 RMD160 6ff2f213fd8d96d06b48f4d4b351025f05880064 SHA1 c9a574ea9b4ca63c2653ae3dc157c8d8e39fd3fb SHA256 b79981348aa23ce3e3c3674497979d1a579a457e43a46e6209d1b93ab0dfa5af
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
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"
+}