summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-06-03 01:58:34 +0000
committerMike Frysinger <vapier@gentoo.org>2010-06-03 01:58:34 +0000
commit5723b37f7c7bf334fddf73a86430eeb4460ae06f (patch)
treebb25a8a5611c2e00194ac8940c188655e8398ecb
parentadd tip about rc_need #223475 #301617 (diff)
downloadgentoo-2-5723b37f7c7bf334fddf73a86430eeb4460ae06f.tar.gz
gentoo-2-5723b37f7c7bf334fddf73a86430eeb4460ae06f.tar.bz2
gentoo-2-5723b37f7c7bf334fddf73a86430eeb4460ae06f.zip
old
-rw-r--r--sys-fs/mdadm/files/64-md-raid.rules18
-rw-r--r--sys-fs/mdadm/files/mdadm-1.9.0-dont-make-man.patch11
-rw-r--r--sys-fs/mdadm/files/mdraid.rc-2.6.3-r427
-rwxr-xr-xsys-fs/mdadm/files/raid-start.sh50
-rw-r--r--sys-fs/mdadm/files/raid-start.sh-2.6.451
-rw-r--r--sys-fs/mdadm/files/udev-141-64-md-raid.rules36
-rw-r--r--sys-fs/mdadm/mdadm-2.6.8.ebuild59
-rw-r--r--sys-fs/mdadm/mdadm-2.6.9-r1.ebuild62
8 files changed, 0 insertions, 314 deletions
diff --git a/sys-fs/mdadm/files/64-md-raid.rules b/sys-fs/mdadm/files/64-md-raid.rules
deleted file mode 100644
index 6bbfd126dffd..000000000000
--- a/sys-fs/mdadm/files/64-md-raid.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# md links hook into "change" events, when the array becomes available
-
-SUBSYSTEM!="block", GOTO="md_end"
-KERNEL!="md[0-9]*", GOTO="md_end"
-ACTION!="add|change", GOTO="md_end"
-
-ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
-
-IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
-ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}"
-ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
-
-IMPORT{program}="vol_id --export $tempnode"
-OPTIONS="link_priority=100"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-LABEL="md_end"
diff --git a/sys-fs/mdadm/files/mdadm-1.9.0-dont-make-man.patch b/sys-fs/mdadm/files/mdadm-1.9.0-dont-make-man.patch
deleted file mode 100644
index 6b33cdeec8d2..000000000000
--- a/sys-fs/mdadm/files/mdadm-1.9.0-dont-make-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-The .man files are never installed so there's no point in
-generating them, especially since the source manpages are
-installed.
-
---- mdadm-1.9.0/Makefile
-+++ mdadm-1.9.0/Makefile
-@@ -69,3 +69,3 @@
-
--all : mdadm mdadm.man md.man mdadm.conf.man
-+all : mdadm
-
diff --git a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4 b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4
deleted file mode 100644
index de6cbd7646f6..000000000000
--- a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r4
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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-2.6.3-r4,v 1.2 2008/02/01 12:42:12 flameeyes Exp $
-
-depend() {
- if [ -e /lib/librc.so ]; then
- # on baselayout-1 this could cause
- # dependency-cycles with checkroot (before *)
- before checkfs fsck
- after modules
- fi
-}
-
-start() {
- if [ ! -e /lib/librc.so ]; 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/files/raid-start.sh b/sys-fs/mdadm/files/raid-start.sh
deleted file mode 100755
index 784094c51b4f..000000000000
--- a/sys-fs/mdadm/files/raid-start.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-# /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,v 1.7 2008/06/28 16:44:39 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
- for node in "$@" ; do
- [ "${node#/dev}" = "${node}" ] && node="/dev/${node}"
- [ -e "${node}" ] && continue
-
- dir=${node%/*}
- [ ! -d "${dir}" ] && mkdir -p "${dir}"
-
- mknod "${node}" b ${MAJOR} ${node##*[![:digit:]]}
- 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/files/raid-start.sh-2.6.4 b/sys-fs/mdadm/files/raid-start.sh-2.6.4
deleted file mode 100644
index e931f9947c8e..000000000000
--- a/sys-fs/mdadm/files/raid-start.sh-2.6.4
+++ /dev/null
@@ -1,51 +0,0 @@
-# /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/files/udev-141-64-md-raid.rules b/sys-fs/mdadm/files/udev-141-64-md-raid.rules
deleted file mode 100644
index 4faf18c10635..000000000000
--- a/sys-fs/mdadm/files/udev-141-64-md-raid.rules
+++ /dev/null
@@ -1,36 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-SUBSYSTEM!="block", GOTO="md_end"
-ACTION!="add|change", GOTO="md_end"
-
-# import data from a raid member and activate it
-#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
-# import data from a raid set
-KERNEL!="md*", GOTO="md_end"
-
-# partitions have no md/{array_state,metadata_version}
-ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
-
-# container devices have a metadata version of e.g. 'external:ddf' and
-# never leave state 'inactive'
-ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
-TEST!="md/array_state", GOTO="md_end"
-ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
-LABEL="md_ignore_state"
-
-IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
-ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
-ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
-ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
-ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace"
-ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n"
-ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
-ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
-
-IMPORT{program}="vol_id --export $tempnode"
-OPTIONS+="link_priority=100"
-OPTIONS+="watch"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-LABEL="md_end"
diff --git a/sys-fs/mdadm/mdadm-2.6.8.ebuild b/sys-fs/mdadm/mdadm-2.6.8.ebuild
deleted file mode 100644
index 328cf9256c02..000000000000
--- a/sys-fs/mdadm/mdadm-2.6.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.8.ebuild,v 1.7 2009/03/06 01:18:41 jer 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 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 mdraid || die "installing mdraid.rc failed"
-
- insinto /etc/udev/rules.d/
- newins "${FILESDIR}"/64-md-raid.rules 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"
-}
diff --git a/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild b/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild
deleted file mode 100644
index cbf087373341..000000000000
--- a/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.9-r1.ebuild,v 1.1 2009/07/29 19:14:32 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}-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 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 mdraid || die "installing mdraid.rc failed"
-
- insinto /etc/udev/rules.d/
- newins "${FILESDIR}"/udev-145-64-md-raid.rules 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"
-}