diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest index db79f4c65f..51f6539fff 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/Manifest @@ -1,5 +1,4 @@ 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.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3 -DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a SHA512 a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd21760cccc7f7ef07128d1aef8ee2e3 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52 +DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch index 014e0731dd..02e651e27c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch @@ -2,18 +2,18 @@ +++ 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 @@ -26,53 +26,53 @@ 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/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml index b84660b0b8..409bac132b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/metadata.xml @@ -1,4 +1,4 @@ - + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild similarity index 52% rename from sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild index 997c97fca9..48c3a385ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug infiniband libressl +tcp rdma systemd" DEPEND=" @@ -37,9 +37,8 @@ PATCHES=( pkg_setup() { linux-info_pkg_setup - # Flatcar: use ewarn instead of die if kernel_is -lt 2 6 16; then - ewarn "Sorry, your kernel must be 2.6.16-rc5 or newer!" + 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 @@ -47,19 +46,34 @@ pkg_setup() { # 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! - CONFIG_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + 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 - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + 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:^node.startup = manual:node.startup = automatic:' \ - -i etc/iscsid.conf || die + sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \ + -i etc/systemd/iscsi* || die default pushd iscsiuio >/dev/null || die @@ -73,9 +87,9 @@ src_configure() { } src_compile() { - use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI - - CFLAGS="" \ + # 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)" \ @@ -84,28 +98,43 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" sbindir="/usr/sbin" install + emake DESTDIR="${ED}" sbindir="/usr/sbin" install # Upstream make is not deterministic, per bug #601514 - rm -f "${D}"/etc/initiatorname.iscsi + 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 + iscsi{,-init}.service iscsid.{service,socket} iscsiuio.{service,socket} ) for unit in ${units[@]} ; do systemd_dounit etc/systemd/${unit} done - systemd_dounit "${FILESDIR}"/iscsi-init.service - systemd_dotmpfilesd "${FILESDIR}"/open-iscsi.conf + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi fperms 600 /etc/iscsi/iscsid.conf - rm "${D}"/etc/iscsi/initiatorname.iscsi - mv "${D}"/etc/iscsi "${D}"/usr/share/iscsi +} + +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 }