commit: 6c7f21694acd195e7176f9680b3ddef1f0f5556f Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Sep 14 10:32:38 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Sep 14 10:32:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7f2169
sys-block/open-iscsi: Bump to version 2.0.878 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-block/open-iscsi/Manifest | 1 + sys-block/open-iscsi/open-iscsi-2.0.878.ebuild | 140 +++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index 15a53b3abe4..d768d940499 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -3,3 +3,4 @@ DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b0 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6 +DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild new file mode 100644 index 00000000000..a1f80e0a347 --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd + +DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.com/"; +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/0.2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug infiniband libressl +tcp rdma systemd" + +DEPEND=" + sys-apps/kmod + sys-block/open-isns:= + sys-kernel/linux-headers + infiniband? ( sys-fabric/ofed ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + systemd? ( sys-apps/systemd ) +" +RDEPEND="${DEPEND} + sys-fs/lsscsi + sys-apps/util-linux" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.876-Makefiles.patch" +) + +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() { + sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \ + -i etc/iscsid.conf || die + sed -e 's@\(/sbin/\)@/usr\1@' \ + -i etc/systemd/iscsi* || die + default + + pushd iscsiuio >/dev/null || die + eautoreconf + popd >/dev/null || die +} + +src_configure() { + use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI + append-lfs-flags +} + +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} $(usex systemd '' -DNO_SYSTEMD)" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + $(usex systemd '' NO_SYSTEMD=1) \ + user +} + +src_install() { + emake DESTDIR="${ED}" sbindir="/usr/sbin" install + # Upstream make is not deterministic, per bug #601514 + rm -f "${ED}"/etc/initiatorname.iscsi + + dodoc README THANKS + + docinto test/ + dodoc test/* + + insinto /etc/iscsi + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + + newconfd "${FILESDIR}"/iscsid-conf.d iscsid + newinitd "${FILESDIR}"/iscsid-init.d iscsid + + local unit + local units=( + iscsi.service + iscsid.{service,socket} + iscsiuio.{service,socket} + ) + for unit in ${units[@]} ; do + systemd_dounit etc/systemd/${unit} + done + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi + fperms 600 /etc/iscsi/iscsid.conf +} + +pkg_postinst() { + in='/etc/iscsi/initiatorname.iscsi' + if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then + { + cat "${EROOT}${in}.example" + echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" + echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" + } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}" + fi +}
