From 926b66861ca72f0a4b08424d24b52ac0f72a60be Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 15 Dec 2021 20:43:13 +0100
Subject: [PATCH] sys-block/open-iscsi: Clean slate to reapply our changes

---
 .../open-iscsi/open-iscsi-2.1.4-r1.ebuild     | 65 ++++++++++++++-----
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 81b755c11e..48c3a385ff 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -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
 }