commit: fdfdde7b9167fa1d8740b2d35947aa0c9d94025b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 19:39:34 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 19:50:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfdde7b
sys-block/open-iscsi: drop 2.1.7 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-block/open-iscsi/Manifest | 1 - .../files/open-iscsi-2.1.7-fix_sed.patch | 67 ---------- sys-block/open-iscsi/open-iscsi-2.1.7.ebuild | 145 --------------------- 3 files changed, 213 deletions(-) diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index cc797e94f30c..a7246276375b 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -1,3 +1,2 @@ DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 -DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3 SHA512 619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0 SHA512 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch deleted file mode 100644 index ad56b823b557..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 66d76978f2ffbe276e84b03a7fac1041a7c3b4c3 Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tam...@43-1.org> -Date: Thu, 2 Jun 2022 13:17:10 -0500 -Subject: [PATCH] Do not hardcode the path of sed - ---- - doc/Makefile | 2 +- - etc/Makefile | 2 +- - libopeniscsiusr/Makefile | 2 +- - utils/Makefile | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/doc/Makefile b/doc/Makefile -index 9ed025d..e121270 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) - TOPDIR = .. - endif - --SED = /usr/bin/sed -+SED = sed - INSTALL = install - - DESTDIR ?= -diff --git a/etc/Makefile b/etc/Makefile -index d065319..2d98027 100644 ---- a/etc/Makefile -+++ b/etc/Makefile -@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d - - HOMEDIR ?= $(etcdir)/iscsi - --SED = /usr/bin/sed -+SED = sed - INSTALL = install - - SYSTEMD_SOURCE_FILES = iscsid.socket iscsiuio.socket -diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile -index 523518b..90903dd 100644 ---- a/libopeniscsiusr/Makefile -+++ b/libopeniscsiusr/Makefile -@@ -29,7 +29,7 @@ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig - MAN_DIR = $(prefix)/share/man - - PKG_CONFIG ?= /usr/bin/pkg-config --SED ?= /usr/bin/sed -+SED ?= sed - - LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr - -diff --git a/utils/Makefile b/utils/Makefile -index a7eb352..15539eb 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -7,7 +7,7 @@ - # from the top-level make file. - # - --SED = /usr/bin/sed -+SED = sed - INSTALL = install - CHMOD = chmod - --- -2.35.1 - diff --git a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild deleted file mode 100644 index 552d373862e7..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info flag-o-matic toolchain-funcs systemd udev - -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" -HOMEPAGE="https://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 ~riscv ~sparc ~x86" -IUSE="debug infiniband +tcp rdma systemd" -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" - -DEPEND=" - sys-apps/kmod - sys-block/open-isns:= - sys-kernel/linux-headers - infiniband? ( sys-cluster/rdma-core ) - dev-libs/openssl:0= - systemd? ( sys-apps/systemd ) -" -RDEPEND="${DEPEND} - sys-fs/lsscsi - sys-apps/util-linux" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch - "${FILESDIR}"/${PN}-2.1.7-fix_sed.patch - "${FILESDIR}"/${PN}-2.1.7-no_werror.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() { - 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() { - # Force serial install to avoid race conditions - emake -j1 \ - DESTDIR="${ED}" \ - sbindir="/usr/sbin" \ - SED="${EPREFIX}/bin/sed" \ - systemddir="$(systemd_get_utildir)" \ - install install_systemd - - # Upstream make is not deterministic, per bug #601514 - rm -f "${ED}"/etc/initiatorname.iscsi - - # QA: install udev rule into right place - mkdir -p "${ED}"/lib/udev/rules.d - mv "${ED}"/etc/udev/rules.d/50-iscsi-firmware-login.rules \ - "${ED}"/lib/udev/rules.d || die "mv failed" - - # QA: let docompress compress man pages - gunzip -r "${ED}"/usr/share/man/man3/ || die "gunzip failed" - gunzip -r "${ED}"/usr/share/man/man8/ || die "gunzip failed" - - dodoc README THANKS - - docinto test/ - dodoc $(find test -maxdepth 1 -type f ! -name ".*") - - insinto /etc/iscsi - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example - - 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 -} - -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 - - udev_reload -}
