Fix extra /dev prefixes being added #211167.

Package-Manager: portage-2.2_pre2
RepoMan-Options: --force

4 files changed, 125 insertions, 2 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index d64e3de81cee..2b4cc812f80f 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.90 2008/02/25 12:50:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.91 2008/02/26 07:18:41 vapier Exp $
+
+*mdadm-2.6.4-r1 (26 Feb 2008)
+
+  26 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/raid-start.sh-2.6.4, +mdadm-2.6.4-r1.ebuild:
+  Fix extra /dev prefixes being added #211167.
 
   25 Feb 2008; Jeroen Roovers <jer@gentoo.org> mdadm-2.6.4.ebuild:
   Stable for HPPA (bug #210946).
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 7d1ed31ff524..389ee3e153c9 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
@@ -9,6 +12,7 @@ AUX mdraid.rc-2.6.3-r4 637 RMD160 6cd883833e8327256b61567eef3372c0b539824f SHA1
 AUX raid-start.sh 1606 RMD160 8adf7b5a60bb3b7e69fcd317b7866072acb9c3c9 SHA1 03daf3b0a4b0f64f6b35b7f6596b7edc2725db10 SHA256 bd6923697c571e29cbbbba7f36a71993f7af30579e1ee176303c3ced39ff16f6
 AUX raid-start.sh-2.6.3-r2 1510 RMD160 a4b717beca02df3ea17a4257b34933c1f6f9a1a6 SHA1 2eabe12927f434219820860021bd51e87a3f1933 SHA256 c05603b77c94d4d340d7cfc4a66d91f5ce36b3489196daad748d3e4ecbc85d37
 AUX raid-start.sh-2.6.3-r4 1500 RMD160 b91366a621fb298fe2f89c2b64a707c69d803895 SHA1 b653d7591928da38f0bd82a61e5b2cf5f811c183 SHA256 0815e7e48f0c90e78cbc0976ba0acf0926b9a7606f6127ea63aefd6b66503a6b
+AUX raid-start.sh-2.6.4 1470 RMD160 c779e6f5ff5fb74c46c8d590a87bc07d97f21943 SHA1 4cd319c799b2ff9c186b89d16a80da64506e7b02 SHA256 f9a65d5947053bc7c6930f2b011b7e4b3a37f1f390beac7a72f0ac3a54d0d174
 AUX raid-stop.sh 895 RMD160 ffffe626fd7e6251e34686a96e831f1bb4075884 SHA1 386e8317a7b2285264fb30137694a9c90e980754 SHA256 d785f81e30cda8d0eb78ac503520284c85c96de0f44e44f69a32a8d2d1e4af1c
 AUX raid-stop.sh-2.6.3-r2 655 RMD160 4510677c8f6efc3d7ab4fb76e50da38f67e6f3b2 SHA1 5f598576c13be9eb16afeba3c980d822293d5b1a SHA256 5548ff921f980918323cf86060c0b3360522a034b020edd7dd4aa8df60976366
 DIST mdadm-2.6.2.tar.bz2 151082 RMD160 04f7598019b28dadcb7ca35c630910e65a036cdf SHA1 623d5462c41fac7b95e641a8bb8587c933d025d9 SHA256 b026731babd23013277d7a0e087d2233ff044deb616c51851dc3adffaae32a55
@@ -20,6 +24,14 @@ EBUILD mdadm-2.6.3-r2.ebuild 1826 RMD160 785d03732eb62c68f916947e8c8f6b8874c80ae
 EBUILD mdadm-2.6.3-r3.ebuild 1832 RMD160 95dc27da94a6d1143a9025b69acac9ef657557bf SHA1 10081ebddd27a452401b7eaee02bdc025652da39 SHA256 43f2a0f93bf68471dd987fb2b1325ffd2abf723dd20b2f42ce3a2357ab55ce65
 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 1819 RMD160 fc2b0ec048b40dcb92a2f4a435acc1566fc897cd SHA1 f9e47d38bda920153b4ae849919da3135ed56da6 SHA256 b22a2314db461ba012f36dda290695bd7ff7e281d2eca2784e3357dd3a1840ca
 EBUILD mdadm-2.6.4.ebuild 1816 RMD160 b8a87c74928da88f96468cf7fbba7622be818ab3 SHA1 5584de8bc3f042bcf3f4adeabe9ffc74f0648346 SHA256 702097db26a94e9ab8dce3bef92cdf5b0a8daa536909fbb69d511ef1dca5dba4
-MISC ChangeLog 14487 RMD160 6270ed752d4eff3838a0f8edcd91277203717329 SHA1 92f77be3646bca433a089a827bf0522e7e5675f7 SHA256 a592ff31e73d60937a9995fb9f7abad3b2a79ca94d042fdf8ad532b227dbd107
+MISC ChangeLog 14673 RMD160 98872252b051de37756fb8750b807580ff4bc9da SHA1 f728df745565f7315428f44eeb3d1aec49c8a89a SHA256 2d112360a3593c9b8aeecc76d88269eb00052c821328bf5a22f60e6fd71c5401
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHw71Xj9hvisErhMIRAvoIAJ9DmovRqvWCWfvAuHiP4tk+fAp1ggCeOa3/
+kFSdNE1Q5/NKrgQBJPSiz/4=
+=RIYU
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/raid-start.sh-2.6.4 b/sys-fs/mdadm/files/raid-start.sh-2.6.4
new file mode 100644
index 000000000000..e931f9947c8e
--- /dev/null
+++ b/sys-fs/mdadm/files/raid-start.sh-2.6.4
@@ -0,0 +1,51 @@
+# /lib/rcscripts/addons/raid-start.sh:  Setup raid volumes at boot
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-start.sh-2.6.4,v 1.1 2008/02/26 07:18:42 vapier Exp $
+
+[ -f /proc/mdstat ] || exit 0
+
+# We could make this dynamic, but eh
+#[ -z ${MAJOR} ] && export MAJOR=$(awk '$2 == "md" { print $1 }' /proc/devices)
+MAJOR=9
+
+# Try to make sure the devices exist before we use them
+create_devs() {
+	local node dir minor
+	for node in "$@" ; do
+		[ "${node#/dev}" = "${node}" ] && node="/dev/${node}"
+		[ -e "${node}" ] && continue
+
+		dir=${node%/*}
+		[ ! -d "${dir}" ] && mkdir -p "${dir}"
+
+		minor=${node##*/}
+		mknod "${node}" b ${MAJOR} "${minor##*md}"
+	done
+}
+
+# Start software raid with mdadm (new school)
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[ -e /etc/mdadm.conf ] && mdadm_conf="/etc/mdadm.conf"
+if [ -x /sbin/mdadm -a -f "${mdadm_conf}" ] ; then
+	devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' "${mdadm_conf}")
+	if [ -n "${devs}" ]; then
+		ebegin "Starting up RAID devices"
+		create_devs ${devs}
+		output=$(mdadm -As 2>&1)
+		ret=$?
+		[ ${ret} -ne 0 ] && echo "${output}"
+		eend ${ret}
+	fi
+fi
+
+partitioned_devs=$(ls /dev/md_d* 2>/dev/null)
+if [ -n "${partitioned_devs}" ]; then
+	ebegin "Creating RAID device partitions"
+	/sbin/blockdev ${partitioned_devs}
+	eend 0
+	# wait because vgscan runs next, and we want udev to fire
+	sleep 1
+fi
+
+# vim:ts=4
diff --git a/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild b/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..0064d64a0456
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild
@@ -0,0 +1,54 @@
+# 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-r1.ebuild,v 1.1 2008/02/26 07:18:41 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
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	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"
+	dodoc INSTALL TODO "ANNOUNCE-${PV}"
+
+	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"
+}