From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 28F6A59CB4 for ; Wed, 20 Apr 2016 20:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 843C621C008; Wed, 20 Apr 2016 20:50:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CE1F21C008 for ; Wed, 20 Apr 2016 20:50:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9062A340C43 for ; Wed, 20 Apr 2016 20:50:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05282188 for ; Wed, 20 Apr 2016 20:50:49 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1461185443.60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/open-iscsi/metadata.xml sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild X-VCS-Directories: sys-block/open-iscsi/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb X-VCS-Branch: master Date: Wed, 20 Apr 2016 20:50:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b992ad4-2ff0-4896-a6ad-cc3b50629cf8 X-Archives-Hash: a8714ee698baae677e0d987f1868aced commit: 60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb Author: Robin H. Johnson gentoo org> AuthorDate: Wed Apr 20 20:50:25 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Apr 20 20:50:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d26a2a sys-block/open-iscsi: Bug #580380: improve checks for rmda/iser vs tcp. Package-Manager: portage-2.2.28 sys-block/open-iscsi/metadata.xml | 5 + sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 112 ++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml index 56c1244..14b6b2e 100644 --- a/sys-block/open-iscsi/metadata.xml +++ b/sys-block/open-iscsi/metadata.xml @@ -5,4 +5,9 @@ base-system@gentoo.org Gentoo Base System + + Support iSCSI over TCP + Support iSCSI over RDMA + Support iSCSI over Infiniband iSER + 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 0000000..a6a58cb --- /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 +}