Stop using /etc/udev which is reserved for user modified rules and read udevdir value from udev.pc pkg-config file instead.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 182 insertions, 23 deletions

diff --git a/sys-infiniband/ofed/ChangeLog b/sys-infiniband/ofed/ChangeLog
index 4eff27ea0dc6..bb3aa9b822c4 100644
--- a/sys-infiniband/ofed/ChangeLog
+++ b/sys-infiniband/ofed/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2012/04/29 13:03:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.5 2012/08/11 12:51:47 ssuominen Exp $
+
+  11 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +ofed-1.5.4.1-r1.ebuild:
+  Stop using /etc/udev which is reserved for user modified rules and read
+  udevdir value from udev.pc pkg-config file instead.
 
   29 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> ofed-1.5.4.1.ebuild:
   [sys-infiniband/ofed] Add rdmacm to minimal set
diff --git a/sys-infiniband/ofed/Manifest b/sys-infiniband/ofed/Manifest
index 24961297cf59..833257ce39c3 100644
--- a/sys-infiniband/ofed/Manifest
+++ b/sys-infiniband/ofed/Manifest
@@ -1,29 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 90-ib.rules 232 RMD160 13aeac8b6ee3bb486257d1e43ce3ab73383816e9 SHA1 df6bde030ba8916eb5872b936fe816cebd189005 SHA256 c44d4937d60bb5b02d2b73d0a0e59a6b094555b060e31f2193c546dfe146f5d3
-AUX openib 6956 RMD160 db425ac48bebb2807f6421e70ddc73f66b0523a2 SHA1 5307664a56a82a293810114abd18a28e5aad272e SHA256 9aa7014969961df8e8fc068d07168d837c2706ddeab95444c6b1c20b4220bcd1
-AUX openib.conf 498 RMD160 4f8ebd6e32feade5927331561f15411bb8d7f9fe SHA1 2a1edc293445b94b27aec85acdfba22e9b73ceec SHA256 8c12ebe735d32f75c1bd4b66077e2642fa26a015cfc7992594066d7feb9fa962
-AUX openib.env 19 RMD160 2b59609462694bb3f1303e15316a4d1e3cfe96ac SHA1 ecaac97de1abe1250a6b436a5cb4a0f40c5605c4 SHA256 5f30d772b77fa4a5aaa1a4ff4188c0f38c0cf6c4138cb6597082c6d20598a467
-AUX openib.modprobe 350 RMD160 a40e8656ee1bdfc26a86b65aa3eaf5553a93b7b8 SHA1 623adbeccde3e88ce2c39d113a409c4d14091f0d SHA256 32054c7ee7caffc21ed320a9be5d0c2cd85e51295c0515521373d658f55ee68e
-DIST OFED-1.5.4.1.tgz 77942614 RMD160 b2f3d0f2000df83e9924819f22fae40a8c3e8a8c SHA1 45e6f72ac17a3cc782c2a41e7872ff876dc3255f SHA256 aeeea9b1173bf7b35d70307467824252e09b2dbebbdada645e6350e2023fa753
-EBUILD ofed-1.5.4.1.ebuild 5568 RMD160 290b3634bbc0b6a18a168659f2fa36c6a408205f SHA1 ff2443244329af822af348b5a976c382d94d2831 SHA256 451ce11c8cc2e834705085b5a27f1e1a7c08c73a40badc8a4d7d18f9c4ef5195
-MISC ChangeLog 845 RMD160 9584c2fb0eee64a5e897935a37c28491335ec2b2 SHA1 592e44a915f3a66207b205c19071a0c7efbc8775 SHA256 7c641ba8b35db34b0d204e42448401f348f82d3ab9b8d5635bb0dd8007c1f600
-MISC metadata.xml 814 RMD160 7c1c96b207bc308570d43cd927dd6cc0f964e2cb SHA1 727cc75025e54fb8690b4f2137191bc71d6be630 SHA256 181824d9ec06da7097152f9961e072f3f764cdf02f4cb7073eb26476893f2e99
+AUX 90-ib.rules 232 SHA256 c44d4937d60bb5b02d2b73d0a0e59a6b094555b060e31f2193c546dfe146f5d3 SHA512 2d2662e9b7dbc3b8d9f08467890f0a154144d6ecd0a72e7e5de44d2b2a5a4858cc27d6d626576251ba657754b226237b6a5d7f9daf6721566bf1b837d746630f WHIRLPOOL 2fd2df383a9eb27500e819f810dce9a3224d08ce15875462bfc3665ff76a4fe3df6f3a5010de11d3eea79a6bf50b520ee91c15626ec0c0d1e7ec48fefd835ccb
+AUX openib 6956 SHA256 9aa7014969961df8e8fc068d07168d837c2706ddeab95444c6b1c20b4220bcd1 SHA512 56694375761338c2049279093d4b775108617aacb84feb77af0f693df371416002857bd7080b2ded555b69c73cb381df976b68b143102a9ce9117d88456af6db WHIRLPOOL d5f3052f4a9fa74a0b3802eec3a4f7c59558b5171a137a44eefe95f1a896d4b9c1b736585c3c65ccc86dfe847ae66d550e49243c936187be1f07f96a5ebc15c8
+AUX openib.conf 498 SHA256 8c12ebe735d32f75c1bd4b66077e2642fa26a015cfc7992594066d7feb9fa962 SHA512 3db825396e2530da6d978ca46eb4dfd6298dbb797158db6fc9831e8fdcf3eb6b5801804fef3aa8919dae45578fd86267167341cd2f8bc9caaaa874c6613ea336 WHIRLPOOL d3fb7a349ce6c273ba2109b338a441915363f88b587a178050e010f5263bd458bb7cc6c45c1894dfc4863c3c6ae53ffdb067fb249d75203a5b80ddd02f94d398
+AUX openib.env 19 SHA256 5f30d772b77fa4a5aaa1a4ff4188c0f38c0cf6c4138cb6597082c6d20598a467 SHA512 016e4f49809d696f63ecd376d31f9f588cd12afde9bc7d42582219a1ce2bbb53851aa0e340c5def498a5013570cd2f1cf7502df85fa998c978ce9d5bcf41f064 WHIRLPOOL f22d92c532224a2a40b1754205b93ec3c31c652951c1016a87c534e10a2fb4a38c1f243149e00b54d141afda3bd48ad7e690bf987086eb32153a4016e113f8af
+AUX openib.modprobe 350 SHA256 32054c7ee7caffc21ed320a9be5d0c2cd85e51295c0515521373d658f55ee68e SHA512 580fd9f53ecf4661181c3d423770e9db75bd767d2efc26115d418b032663f7397637fae5f736d3acc803152af76946b1851b1444da1c4472ca42ca32c84b5d1c WHIRLPOOL e35f1a9c809dbc4f608376a9d4508093c099213f59b34e00100732c2f84782016cf763df75bc8032fa5f1af37647ea38be6e92a1ee9ae3e2958812be42b9d1fe
+DIST OFED-1.5.4.1.tgz 77942614 SHA256 aeeea9b1173bf7b35d70307467824252e09b2dbebbdada645e6350e2023fa753
+EBUILD ofed-1.5.4.1-r1.ebuild 5674 SHA256 f00d6c584cafb6a4e522f6e7134c660618039df6eb8bcaf24683553a642e7fad SHA512 45f6f72568c53abd95c091a1028f572128e22cd2d8c92999e2469270c614fe6a6d57e1b84921efea28dde47d73dd5c113accdf5f1ce23ad8ca6d00e1205ab645 WHIRLPOOL 1091728593768c18b330070825d8af744a53ce188cc6b5117f7044874426eae806fa099974eafa561c404aaf676aeb4d47cd983d36dc6e4abd6a33673014ee31
+EBUILD ofed-1.5.4.1.ebuild 5568 SHA256 451ce11c8cc2e834705085b5a27f1e1a7c08c73a40badc8a4d7d18f9c4ef5195 SHA512 9d26bfe2ead3091e395b228cbaa40ac0f2707a157090a6ea07be7215561eceed5a55159e40e6c8452c07ae80d93119821bee31d1524acac877b722839a510927 WHIRLPOOL 35a4a3c0f2f085059d73724ac81c30e2ac52a6654ed345403a4e6682e756258f51e29150cbc997494209e5590e945768b8653aec64ba06901b2027ba9ada882e
+MISC ChangeLog 1056 SHA256 3d56b768c634d80a6edde3a51577b99aee5e51d3592da46f76e6e55d056a0c9a SHA512 9d31ba129f05d1a577422792a5ba2b571dc19fa801a04ce44d1189403dae4d14a3735dba24bcb569bc14c3ce3866edf00203727989a94a9cc256f16d5ef04b6b WHIRLPOOL 116e4efedd1a511fe05bed056a12528f2070f995d4e19f63e0b75d8917c2274ed2b34c023119d46904333bdf3e3bda83b963be08becef2672753dbd602274557
+MISC metadata.xml 814 SHA256 181824d9ec06da7097152f9961e072f3f764cdf02f4cb7073eb26476893f2e99 SHA512 e64ee1c85a9bee7375ed22193dc567013074308af93841f44e25b97ef878ee3a40755029c60fe449e0fcdb9e4a3eb70a6fe032de367cde4bcba7e6c7b34b5bd2 WHIRLPOOL aa6141bd2f0ed54fa2c460add8f42a4027656e41b7560d52acd026b9f2843c952ab59e7ed9ee25bfb835f8805c6fe99fc6f8b45c5e9ffbd018de05639ad74715
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPnTv/AAoJEOf+E+/4L5LmpasP/2OrIu0PkmXPWFf7worzsXw8
-Wz3+HxFehavt57LNYBc6cgRyjj6sZ2wkcr3M4VacUp4QzemRcreQKBpF7ZRJakVk
-1EhVXnm9WLXKAXti0YGjMG7RvuTcgUNdrtnoc56vy6FMRFqncL4L540KKREvuunK
-ycOC5+4nuNcLqRxsmHFXL4hoRtw0q/dodS8HQ9nw/2f5iulaih9jjM1lZQe3CTwO
-br1r41eSvhKPmwlU2g30Kp6gvrWTgDaUVrNPZgF5QISuM/B2iDlAM99uPsFj6jjQ
-TW7dlOVXVxN+UnsCHXF2+q7hkplk8+w34herQ55Iyg/EaDiBOhoFwjLgAyrIUtF7
-Oyd7sVBLT1hJjSMwaD3OUbIWebjeYDSNCivEfwDyIUWNtFZ3nfhqskRXhnZXZZ6B
-69A5b5+gdw2VmrrX+OfTEC+col71yH8iYfiZvklJMJtRC/yH28rA7lwXMKbfTM+L
-kTgbi/8LBwNTMdtXjwavs1So75yp7OoE7oVnCRyssWSXafN7yM2Zg8oBAiZ+9w40
-jiDZttQoUbrY5PLMTPfisW0CS1n6ONwvp/W85hvvUoTfQzOeDSg6GjPBCqrgh0zJ
-Oyf5/xLcQ0/Swg0HtMywdx05usKZ43X6sQWzkjGridRJJi9MCvrVlfJ0CuoMTAaO
-43TTwuCIQp09+GE5zzrs
-=TeR+
+iQEcBAEBCAAGBQJQJlVGAAoJEEdUh39IaPFNAGgH/3CmChH0Abi8Xip2JS8L8QlT
+el0Tp9ULXgBzSzIyn13XkF3cFHN8Sz7Eog8v+8jhcEUkg5BSnYz6m2VBkryEmgCO
+2qvKTRq5+RBYuwZhkgBtBLYLLBr3gnc8Xi7hTjBhJXDlBt6yNpQrQsAc2bPHJC0r
+o1dKko9vsW+KxtUjBBTCWB4F5wVqh/cXXVLTTHo5C5GPLyYlWS50HaDeU/YOYXTy
+ERM9fbMLmSOeh9i0/jV5ohx8Ili1E0EOi0I6wYJK6ZaUeLxR15mQu4u+JjqssxjQ
+rPhpYWIebZw42sMapbhbLo1DP+OggGd+sSa2FGQ7gAuIkduq+Rm0c4qHVI2nV40=
+=L+0t
 -----END PGP SIGNATURE-----
diff --git a/sys-infiniband/ofed/ofed-1.5.4.1-r1.ebuild b/sys-infiniband/ofed/ofed-1.5.4.1-r1.ebuild
new file mode 100644
index 000000000000..e4aa4979da7e
--- /dev/null
+++ b/sys-infiniband/ofed/ofed-1.5.4.1-r1.ebuild
@@ -0,0 +1,160 @@
+# 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-r1.ebuild,v 1.1 2012/08/11 12:51:47 ssuominen 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 toolchain-funcs
+
+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}"
+
+RDEPEND="!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} )
+		"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		"
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	insinto "${udevdir}"/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\`"
+
+}