diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2016-04-20 13:50:25 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-04-20 13:50:43 -0700 |
commit | 60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb (patch) | |
tree | d14a76701b9737828ed6294b0697d743da4b3c57 /sys-block | |
parent | mail-client/thunderbird: drop old (diff) | |
download | gentoo-60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb.tar.gz gentoo-60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb.tar.bz2 gentoo-60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb.zip |
sys-block/open-iscsi: Bug #580380: improve checks for rmda/iser vs tcp.
Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-block')
-rw-r--r-- | sys-block/open-iscsi/metadata.xml | 5 | ||||
-rw-r--r-- | sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 112 |
2 files changed, 117 insertions, 0 deletions
diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml index 56c124413057..14b6b2ec20be 100644 --- a/sys-block/open-iscsi/metadata.xml +++ b/sys-block/open-iscsi/metadata.xml @@ -5,4 +5,9 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> + <use> + <flag name="tcp">Support iSCSI over TCP</flag> + <flag name="rdma">Support iSCSI over RDMA</flag> + <flag name="infiniban">Support iSCSI over Infiniband iSER</flag> + </use> </pkgmetadata> diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild new file mode 100644 index 000000000000..a6a58cb00a1f --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev + +MY_P="${PN}-$(replace_version_separator 2 "-")" + +DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.org/" +SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug slp +tcp infiniband rdma" + +DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-infiniband/ofed )" +RDEPEND="${DEPEND} + sys-fs/lsscsi + sys-apps/util-linux" +REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is -lt 2 6 16; then + die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + fi + + # Needs to be done, as iscsid currently only starts, when having the iSCSI + # support loaded as module. Kernel builtin options don't work. See this for + # more information: + # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 + # If there's a new release, check whether this is still valid! + TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + RDMA_MODULES="INFINIBAND_ISER" + INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS" + CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )" + if linux_config_exists; then + if use tcp; then + for module in ${TCP_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + if use infiniband; then + for module in ${INFINIBAND_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + if use rdma; then + for module in ${RDMA_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$ + done + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-Makefiles.patch + epatch "${FILESDIR}"/${P}-memset.patch + + sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die +} + +src_configure() { + use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI + append-lfs-flags + + cd utils/open-isns || die + + # SSL (--with-security) is broken + econf $(use_with slp) \ + --without-security +} + +src_compile() { + # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build + # is messed up already here, so it's not making it that much worse. + KSRC="${KV_DIR}" CFLAGS="" \ + emake \ + OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + user +} + +src_install() { + emake DESTDIR="${ED}" sbindir="/usr/sbin" install + + dodoc README THANKS + + docinto test/ + dodoc test/* + + insinto /etc/iscsi + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + + # udev pieces + udev_dorules "${FILESDIR}"/99-iscsi.rules + exeinto /etc/udev/scripts + doexe "${FILESDIR}"/iscsidev.sh + + newconfd "${FILESDIR}"/iscsid-conf.d iscsid + newinitd "${FILESDIR}"/iscsid-init.d iscsid + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi + fperms 600 /etc/iscsi/iscsid.conf +} |