punt old, still hardcoding /etc/udev as rules path

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

2 files changed, 4 insertions, 162 deletions

diff --git a/sys-infiniband/ofed/ChangeLog b/sys-infiniband/ofed/ChangeLog
index 571d9bd92bd9..d173f631e267 100644
--- a/sys-infiniband/ofed/ChangeLog
+++ b/sys-infiniband/ofed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-infiniband/ofed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.8 2012/12/11 19:19:44 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.9 2012/12/11 21:36:58 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> -ofed-1.5.4.1.ebuild:
+  old
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> ofed-1.5.4.1-r1.ebuild,
   ofed-3.5.ebuild:
diff --git a/sys-infiniband/ofed/ofed-1.5.4.1.ebuild b/sys-infiniband/ofed/ofed-1.5.4.1.ebuild
deleted file mode 100644
index 768a286cbf72..000000000000
--- a/sys-infiniband/ofed/ofed-1.5.4.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ofed-1.5.4.1.ebuild,v 1.4 2012/04/29 13:03:20 alexxy Exp $
-
-EAPI="4"
-
-OFED_VER="1.5.4.1"
-OFED_SUFFIX="OFED.1.5.4.1"
-
-IUSE_OFED_DRIVERS="
-		ofed_drivers_cxgb3
-		ofed_drivers_cxgb4
-		ofed_drivers_ehca
-		ofed_drivers_ipath
-		ofed_drivers_mlx4
-		ofed_drivers_mthca
-		ofed_drivers_nes
-		ofed_drivers_psm"
-
-inherit openib
-
-DESCRIPTION="OpenIB system files"
-SCRIPTDIR="${S}/ofed_scripts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="compat-dapl dapl +diags ibacm mstflint +opensm perftest rds sdp srp ${IUSE_OFED_DRIVERS}"
-
-DEPEND="!sys-infiniband/openib
-		!sys-infiniband/openib-files
-		sys-infiniband/libibcm:${SLOT}
-		sys-infiniband/libibmad:${SLOT}
-		sys-infiniband/libibumad:${SLOT}
-		sys-infiniband/librdmacm:${SLOT}
-		compat-dapl? ( sys-infiniband/compat-dapl:${SLOT} )
-		dapl? ( sys-infiniband/dapl:${SLOT} )
-		diags? ( sys-infiniband/infiniband-diags:${SLOT} )
-		ibacm? ( sys-infiniband/ibacm:${SLOT} )
-		mstflint? ( sys-infiniband/mstflint:${SLOT} )
-		opensm? ( sys-infiniband/opensm:${SLOT} )
-		perftest? ( sys-infiniband/perftest:${SLOT} )
-		sdp? ( sys-infiniband/libsdp:${SLOT} )
-		srp? ( sys-infiniband/srptools:${SLOT} )
-		ofed_drivers_cxgb3? ( sys-infiniband/libcxgb3:${SLOT} )
-		ofed_drivers_cxgb4? ( sys-infiniband/libcxgb4:${SLOT} )
-		ofed_drivers_ehca? ( sys-infiniband/libehca:${SLOT} )
-		ofed_drivers_ipath? ( sys-infiniband/libipathverbs:${SLOT} )
-		ofed_drivers_mlx4? ( sys-infiniband/libmlx4:${SLOT} )
-		ofed_drivers_mthca? ( sys-infiniband/libmthca:${SLOT} )
-		ofed_drivers_nes? ( sys-infiniband/libnes:${SLOT} )
-		ofed_drivers_psm? ( sys-infiniband/infinipath-psm:${SLOT} )
-		"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	einfo "Nothing to configure"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	insinto /etc/udev/rules.d
-	newins "${SCRIPTDIR}/90-ib.rules" 40-ib.rules
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/openib.modprobe" openib.conf
-	newenvd "${FILESDIR}/openib.env" 02openib
-	insinto /etc/infiniband
-
-	doinitd "${FILESDIR}/openib"
-
-	# build openib.conf based on ofed_scripts/ofa_kernel.spec
-	build_ipoib=1
-	build_sdp=1
-	cp "${SCRIPTDIR}/openib.conf" "${T}"
-	IB_CONF_DIR=${T}
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load UCM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "UCM_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load RDMA_CM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "RDMA_CM_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load RDMA_UCM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "RDMA_UCM_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Increase ib_mad thread priority" >> ${IB_CONF_DIR}/openib.conf
-	echo "RENICE_IB_MAD=no" >> ${IB_CONF_DIR}/openib.conf
-
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load MTHCA" >> ${IB_CONF_DIR}/openib.conf
-	echo "MTHCA_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	if use ofed_drivers_ipath; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load IPATH" >> ${IB_CONF_DIR}/openib.conf
-		echo "IPATH_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use ofed_drivers_ehca; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load eHCA" >> ${IB_CONF_DIR}/openib.conf
-		echo "EHCA_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use ofed_drivers_mlx4; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load MLX4 modules" >> ${IB_CONF_DIR}/openib.conf
-		echo "MLX4_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if (( build_ipoib )); then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load IPoIB" >> ${IB_CONF_DIR}/openib.conf
-		echo "#IPOIB_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable IPoIB Connected Mode" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SET_IPOIB_CM=yes" >> ${IB_CONF_DIR}/openib.conf
-		# from ofa_user.spec:
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable IPoIB High Availability daemon" >> ${IB_CONF_DIR}/openib.conf
-		echo "#IPOIBHA_ENABLE=no" >> ${IB_CONF_DIR}/openib.conf
-		echo "# PRIMARY_IPOIB_DEV=ib0" >> ${IB_CONF_DIR}/openib.conf
-		echo "# SECONDARY_IPOIB_DEV=ib1" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if (( build_sdp )); then
-		 echo >> ${IB_CONF_DIR}/openib.conf
-		 echo "# Load SDP module" >> ${IB_CONF_DIR}/openib.conf
-		 echo "#SDP_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use srp; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load SRP module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SRP_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-		# from ofa_user.spec:
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable SRP High Availability daemon" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SRPHA_ENABLE=no" >> ${IB_CONF_DIR}/openib.conf
-
-	fi
-	if use iser; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load ISER module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#ISER_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use rds; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load RDS module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#RDS_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use vnic; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load VNIC module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#VNIC_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-
-	doins "${T}/openib.conf"
-}
-
-pkg_postinst() {
-	einfo "Configuration file installed in /etc/infiniband/openib.conf"
-	einfo "To automatically initialize infiniband on boot, add openib to your"
-	einfo "start-up scripts, like so:"
-	einfo "\`rc-update add openib default\`"
-
-}