From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-block/open-iscsi/Manifest | 10 +- .../files/open-iscsi-2.0.876-Makefiles.patch | 61 --------- .../open-iscsi-2.0.878-gcc10-fno-common.patch | 107 ---------------- sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 4 +- sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild | 141 --------------------- sys-block/open-iscsi/open-iscsi-2.1.0.ebuild | 140 -------------------- sys-block/open-iscsi/open-iscsi-2.1.2.ebuild | 140 ++++++++++++++++++++ 7 files changed, 145 insertions(+), 458 deletions(-) delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch delete mode 100644 sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch delete mode 100644 sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild delete mode 100644 sys-block/open-iscsi/open-iscsi-2.1.0.ebuild create mode 100644 sys-block/open-iscsi/open-iscsi-2.1.2.ebuild (limited to 'sys-block/open-iscsi') diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index e541b86bb221..27aef6285a79 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -9,17 +9,13 @@ AUX open-iscsi-2.0.874-Makefiles.patch 4087 BLAKE2B cba133471f1c22987cd8be4e7ea4 AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03 AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064 -AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240 -AUX open-iscsi-2.0.878-gcc10-fno-common.patch 3038 BLAKE2B 9c188ff87e2a4fd418b39380f9b2886ead9be419c1141936b23238559fed82fa90d16f8ecb8f8e191facecd8338a85861968af2bde7d0116ac0e88c0a15ad69d SHA512 1765b2cce24c45f4c151e6ae38a323837074b3a42611e37c63ac36c3b75464ae391dafccc0627a9a063955a86604da8204ecc0aa6241db82246b4757005b9261 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 -DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33 -DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f SHA512 bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3 +DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a SHA512 a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd21760cccc7f7ef07128d1aef8ee2e3 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339 -EBUILD open-iscsi-2.0.875.ebuild 3714 BLAKE2B 4d50d94574f3e16ef32a94287048719d83085457b66157ab402bc4c1b8674575910a3275baeef1cd462e8b6cdfa8efd37acb55dcac08e0d47a130d7fea6e2603 SHA512 e82f636a9c91d8dce36d248de9f2e2123505435dd15f1ac9273ccf6628641e8809ff9fd6cfd8b037b88699641e49170d145b2d8fa349156ff6aad2d833cba6a9 -EBUILD open-iscsi-2.0.878-r1.ebuild 4048 BLAKE2B ef4daf567e9936937252187c1a4f244c0dec0b0d673eac0a3e743dabf99efced2fb3d3c095395cf81515e406b88cf387c202d80206917e8a80c68a65965582af SHA512 9356340d8bb850ff8a62a4f68c3174499cc9df6924f9496598bc50826983eecc5ca8381176d3f1b1e02a37aedd61ebae0b80935c97d124868e0c5c034b3bb59f -EBUILD open-iscsi-2.1.0.ebuild 3996 BLAKE2B 9bd9e7b64838e3e3e02f0e7fc00706f580687db254bde71c89aa547050025ed1c7d2d10b8f3727d091adf051cc3f73eea456fea28c5bb92c5b11feda56590ee1 SHA512 3da8ce679baa5a0adcf65b553f65cbbe6d22970c409c02bf0f25f8b9bb4b4c9cbda3aaafd85d38289ef437fb08cb53cec83ecdd2634889769e47c852835d1b2d +EBUILD open-iscsi-2.0.875.ebuild 3710 BLAKE2B 19bdadc17ba56edadb5ff18eaf00e08ef71fb4baef0cfaed73355bf09b2c4311f8cb9d99f9220ddcb14bdcbce0a1dc782ef895916f19d06c0fbc1f5297115974 SHA512 dbedc69c799eb9172d7c150102a58b79bfa1a40c5841a05819339c866204503a70f3482701b2faf667f07dcda6c2d4275f4b2c5a6c0f3009755a86d5951f4bf2 EBUILD open-iscsi-2.1.1.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c +EBUILD open-iscsi-2.1.2.ebuild 4033 BLAKE2B c52114f0167c8cf3ada73ce1dfe8c3c8d9db2859154a7d496ab8e11c176c809f8515fcc8ee21118ebb76e1b049f52410179de2a4f16011cb1725ffca321d9f8f SHA512 d515ce74e88cb35fa3982e45ae27fd5656fe5503c783f36ba27b7ca1d3d0b2d60aef3ecdd0b02c407b1913a87b8514a6be1ac491b7c0a3cb4866e734b561d08c MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch deleted file mode 100644 index 2cfa43622853..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(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 --- -2.16.2 - diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch deleted file mode 100644 index b61476555fb4..000000000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Tue, 28 Jan 2020 16:36:56 -0800 -Subject: [PATCH] Updates to support gcc -fno-common option. - -This meant cleaning up the definition of some -global variables, so that they were only defined -in one place and refered to as external elsewhere. ---- - include/iscsi_err.h | 6 ++++-- - iscsiuio/configure.ac | 2 +- - iscsiuio/src/uip/uip.h | 4 ++-- - usr/iscsi_err.c | 2 ++ - usr/log.c | 1 + - usr/log.h | 2 +- - 6 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/include/iscsi_err.h b/include/iscsi_err.h -index ed000dd0..04a8723e 100644 ---- a/include/iscsi_err.h -+++ b/include/iscsi_err.h -@@ -4,7 +4,7 @@ - #ifndef _ISCSI_ERR_ - #define _ISCSI_ERR_ - --enum { -+enum iscsi_error_list { - ISCSI_SUCCESS = 0, - /* Generic error */ - ISCSI_ERR = 1, -@@ -73,7 +73,9 @@ enum { - - /* Always last. Indicates end of error code space */ - ISCSI_MAX_ERR_VAL, --} iscsi_err; -+}; -+ -+extern enum iscsi_error_list iscsi_err; - - extern void iscsi_err_print_msg(int err); - extern char *iscsi_err_to_str(int err); -diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac -index b41df0ec..8099f09c 100644 ---- a/iscsiuio/configure.ac -+++ b/iscsiuio/configure.ac -@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[ - else - echo 'char *build_date = "'`date`'";' > src/unix/build_date.c - fi -- echo 'char *build_date;'> src/unix/build_date.h -+ echo 'extern char *build_date;'> src/unix/build_date.h - ]],[[]]) - - AC_PREFIX_DEFAULT() -diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h -index 1180ab50..9d9428a2 100644 ---- a/iscsiuio/src/uip/uip.h -+++ b/iscsiuio/src/uip/uip.h -@@ -70,8 +70,8 @@ struct uip_stack; - typedef u16_t uip_ip4addr_t[2]; - typedef u16_t uip_ip6addr_t[8]; - --const uip_ip6addr_t all_zeroes_addr6; --const uip_ip4addr_t all_zeroes_addr4; -+extern const uip_ip6addr_t all_zeroes_addr6; -+extern const uip_ip4addr_t all_zeroes_addr4; - - #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf) - #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf) -diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c -index 23c61fc3..4a057d57 100644 ---- a/usr/iscsi_err.c -+++ b/usr/iscsi_err.c -@@ -21,6 +21,8 @@ - #include "iscsi_err.h" - #include "log.h" - -+enum iscsi_error_list iscsi_err; -+ - static char *iscsi_err_msgs[] = { - /* 0 */ "", - /* 1 */ "unknown error", -diff --git a/usr/log.c b/usr/log.c -index f29b54b3..6e16e7ce 100644 ---- a/usr/log.c -+++ b/usr/log.c -@@ -33,6 +33,7 @@ - - char *log_name; - int log_level = 0; -+struct logarea *la = NULL; - - static int log_stop_daemon = 0; - static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap); -diff --git a/usr/log.h b/usr/log.h -index 486a08ea..c548791e 100644 ---- a/usr/log.h -+++ b/usr/log.h -@@ -64,7 +64,7 @@ struct logarea { - union semun semarg; - }; - --struct logarea *la; -+extern struct logarea *la; - - extern int log_init(char *program_name, int size, - void (*func)(int prio, void *priv, const char *fmt, va_list ap), diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild index dcb2eadf66ab..a72a670d11f1 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86" IUSE="debug infiniband +tcp rdma" DEPEND="sys-block/open-isns:= diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild deleted file mode 100644 index a622e3b62f5b..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2020 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" - "${FILESDIR}/${PN}-2.0.878-gcc10-fno-common.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 -} diff --git a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild deleted file mode 100644 index a1f80e0a3472..000000000000 --- a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# 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 -} diff --git a/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild new file mode 100644 index 000000000000..d7ff6b52509f --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2020 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.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 '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.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 +} -- cgit v1.2.3