From 949d34bf3917ec5a5f27dc8fb297c5a8a95ce1c0 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 6 May 2019 14:50:48 +0200 Subject: sys-block/open-iscsi: Revbump to fix a space issue Bug: https://bugs.gentoo.org/685190 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler --- .../open-iscsi-2.0.876-space_in_node-mode.patch | 28 +++++ .../open-iscsi-2.0.876_p20180814-r1.ebuild | 126 +++++++++++++++++++++ .../open-iscsi/open-iscsi-2.0.876_p20180814.ebuild | 125 -------------------- 3 files changed, 154 insertions(+), 125 deletions(-) create mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch create mode 100644 sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild delete mode 100644 sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild (limited to 'sys-block/open-iscsi') diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch new file mode 100644 index 000000000000..1b72eec79450 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch @@ -0,0 +1,28 @@ +From baa0cb45cfcf10a81283c191b0b236cd1a2f66ee Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Fri, 12 Oct 2018 09:57:20 -0700 +Subject: [PATCH] Restore space in node-mode level 0 output + +As part of the libopeniscsiusr update, the output +of "iscsiadm -m node" dropped a space that needs to +be between the portal and the target, for proper +parsing. + +Fixes: 87ea50a1c3a97 +--- + usr/iscsiadm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c +index e3ba03c8..25c6cdc0 100644 +--- a/usr/iscsiadm.c ++++ b/usr/iscsiadm.c +@@ -683,7 +683,7 @@ static int login_portals(struct node_rec *pattern_rec) + + static void print_node_flat(struct iscsi_node *node) + { +- printf("%s,%" PRIu16 "%s\n", ++ printf("%s,%" PRIu16 " %s\n", + iscsi_node_portal_get(node), + iscsi_node_tpgt_get(node), + iscsi_node_target_name_get(node)); diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild new file mode 100644 index 000000000000..8d18bfc1ed40 --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd + +MY_COMMIT="96c1a8e344d93594a3bb4faa848f878cc7315bde" + +DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.com/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT}.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 +tcp rdma" + +DEPEND="sys-block/open-isns:= + infiniband? ( sys-fabric/ofed ) + sys-kernel/linux-headers" +RDEPEND="${DEPEND} + sys-fs/lsscsi + sys-apps/util-linux" +REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch" + "${FILESDIR}/${PN}-2.0.876-Makefiles.patch" + "${FILESDIR}/${PN}-2.0.876-space_in_node-mode.patch" #685190 +) + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +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 -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || 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}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + 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 + + systemd_dounit "${S%/}"/etc/systemd/iscsid.service + + 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}" -a -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 +} diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild deleted file mode 100644 index b111b48a68e6..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd - -MY_COMMIT="96c1a8e344d93594a3bb4faa848f878cc7315bde" - -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="http://www.open-iscsi.com/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT}.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 +tcp rdma" - -DEPEND="sys-block/open-isns:= - infiniband? ( sys-fabric/ofed ) - sys-kernel/linux-headers" -RDEPEND="${DEPEND} - sys-fs/lsscsi - sys-apps/util-linux" -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch" - "${FILESDIR}/${PN}-2.0.876-Makefiles.patch" -) - -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -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 -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || 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}" \ - AR="$(tc-getAR)" CC="$(tc-getCC)" \ - 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 - - systemd_dounit "${S%/}"/etc/systemd/iscsid.service - - 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}" -a -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 -} -- cgit v1.2.3-65-gdbad