diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-26 14:07:48 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-26 14:07:48 +0000 |
commit | adb727afeb568404873e8cbc91ba93d3d49eff13 (patch) | |
tree | d86cdceda93a48d792f162c7b5f054f09c41ee73 /sys-block/open-iscsi | |
parent | ed94061721073b4f7b546c30ae337f5737939985 (diff) |
gentoo auto-resync : 26:12:2022 - 14:07:48
Diffstat (limited to 'sys-block/open-iscsi')
-rw-r--r-- | sys-block/open-iscsi/Manifest | 3 | ||||
-rw-r--r-- | sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch | 78 | ||||
-rw-r--r-- | sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild | 139 |
3 files changed, 0 insertions, 220 deletions
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index 237fc492bda2..6fa1e0481436 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -1,10 +1,7 @@ AUX initiatorname.iscsi 1152 BLAKE2B 32ddfef007a3cef2c22c6f49319587065d527000d0d53d9c588c2935b2e94c1396d5113837c8f2cf6a4e2b7d5c25504b6d652520d2155a9ae832ea716dede8ba SHA512 3abd69a3b070695a96e753fb02356a53e1a59f466e7ad87cbb64cfac58761df37e7c950c5c1ac13209e6e64f1a25d88969a4d8a7d698aa32100e9e55495fba5e AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e51aaddd32f12fafbe1b8542fc8a34d5da0233a26ee557c7e9613fa8436d9c9312a9e2f6902a1e5 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc -AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b AUX open-iscsi-2.1.7-fix_bitwise.patch 1480 BLAKE2B c5076f91885866042d99eef8d905fef4375645863bbf840fbec6c1bbc568ee98866b7fc74b2a78eb675a72cf800c82d11fd28438e9653e696f7d6260896b3f1a SHA512 b9474d78f1616bfdcfc2e11f51faa4a0398a30d00af50a7ae885a8ea07fdf1ba06a354e2ffec777ee2d9598c386093a1f89c4bb633a85a85011f6fa42b307a71 -DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0 SHA512 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1 -EBUILD open-iscsi-2.1.4-r2.ebuild 3995 BLAKE2B cde9eedfd0adce665015ced51a9a6a83c6d4e163ebcd3578c4733b9816829d815db0d0c11a502be52c15a9ec1ea47a4b248a1ed4d44e9939096281b8fc69b0e8 SHA512 7a3fa0b2296478e1fe7b00f73b6aa7dc6117781958835d6e9f038e7b6cd2b22e4ae53c78543addc69bba1079238d7b455260ce825d6ef6792865323202735896 EBUILD open-iscsi-2.1.8.ebuild 3346 BLAKE2B b575b5b9238c7218fcc7d2dc64d7ca76c032100df942b72782d1c7b3a8d3628dde40126933cbf5b5e85a928dba7b96a8a8080e99d50dbedb67a5c17c83d340a5 SHA512 0780ea38e6b96d7a02867dbb3467aa4bfe22899644dfc65c100f8622e15257c9ff5f78a75a00a5b54108c9434ca96dad17ca84f99c8ef54d20d3b4de2173b8a6 MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch deleted file mode 100644 index 02e651e27c21..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/libopeniscsiusr/Makefile -+++ b/libopeniscsiusr/Makefile -@@ -44,7 +44,7 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3 - OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o - - CFLAGS ?= -O2 -g --CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC -+CFLAGS += -Wall -Wextra -fvisibility=hidden -fPIC - CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) - - LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -35,7 +35,7 @@ endif - PKG_CONFIG = /usr/bin/pkg-config - - CFLAGS ?= -O2 -g --WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common -+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common - CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - -I$(TOPDIR)/libopeniscsiusr - CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) -@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o - $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB) - clean: -- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) -+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ - - clean: -- rm -f *.o $(PROGRAMS) .depend -+ $(RM) *.o $(PROGRAMS) .depend - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend ---- a/utils/fwparam_ibft/Makefile -+++ b/utils/fwparam_ibft/Makefile -@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr - all: $(OBJS) - - clean: -- rm -f *.o $(CLEANFILES) .depend -+ $(RM) *.o $(CLEANFILES) .depend - - $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend ---- a/utils/sysdeps/Makefile -+++ b/utils/sysdeps/Makefile -@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o - all: $(SYSDEPS_OBJS) - - clean: -- rm -f *.o .depend -+ $(RM) *.o .depend - - depend: -- gcc $(CFLAGS) -M `ls *.c` > .depend -+ $(CC) $(CFLAGS) -M `ls *.c` > .depend - - -include .depend diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild deleted file mode 100644 index a2d3cf4be973..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild +++ /dev/null @@ -1,139 +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 udev systemd - -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 sparc x86" -IUSE="debug infiniband +tcp rdma systemd" - -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" - -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" - -PATCHES=( - "${FILESDIR}/${PN}-2.1.1-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 '/[^usr]\/sbin/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 $(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 - - local unit - local units=( - iscsi{,-init}.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 -} |