[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     909dc831cc060ea52824596cf8ce32b418600c6f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 03:28:05 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 03:32:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909dc831

sys-block/open-iscsi: prevent endless changes of /etc/iscsi/initiatorname.iscsi.

Upstream now generates /etc/iscsi/initiatorname.iscsi during the install
phase, but it is NOT deterministic. The content of the file should be
generated ONCE and kept over upgrades & reinstalls.

The upstream Makefile assumes that DESTDIR is the rootfs, and generates
/etc/iscsi/initiatorname.iscsi anytime it does not exist.

Build /etc/iscsi/initiatorname.iscsi ourselves, as we used to do in
older versions.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=601514
Gentoo-Bug: 601514
Package-Manager: portage-2.3.6
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 121 ++++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
new file mode 100644
index 00000000000..1f5180b364b
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator linux-info flag-o-matic toolchain-funcs udev
+
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="https://github.com/open-iscsi/open-iscsi" # http://www.open-iscsi.com is dead
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband slp +tcp rdma"
+
+DEPEND="sys-block/open-isns:=
+	slp? ( net-libs/openslp )
+	infiniband? ( sys-fabric/ofed )"
+RDEPEND="${DEPEND}
+	sys-fs/lsscsi
+	sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefiles.patch"
+	"${FILESDIR}/${P}-musl-fixes.patch"
+	"${FILESDIR}/${P}-musl-ethtool-compat.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 -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
+	default
+}
+
+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}" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		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
+
+	# udev pieces
+	udev_dorules "${FILESDIR}"/99-iscsi.rules
+	exeinto /etc/udev/scripts
+	doexe "${FILESDIR}"/iscsidev.sh
+
+	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}" -a -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
+}