From 1cbe7c1fd2fa796481827173d2ae4f928177f830 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Mon, 18 Jan 2021 19:09:28 +0530 Subject: [PATCH] sys-block/open-iscsi: Apply Flatcar patches Signed-off-by: Sayan Chowdhury --- .../open-iscsi/files/iscsi-init.service | 9 +++ .../open-iscsi/files/open-iscsi.conf | 2 + .../open-iscsi/open-iscsi-2.1.3.ebuild | 63 +++++-------------- 3 files changed, 28 insertions(+), 46 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsi-init.service create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsi-init.service b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsi-init.service new file mode 100644 index 0000000000..c78005c549 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsi-init.service @@ -0,0 +1,9 @@ +[Unit] +Description=One time configuration for iscsi.service +After=systemd-tmpfiles-setup.service +ConditionPathExists=!/etc/iscsi/initiatorname.iscsi + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi' diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf new file mode 100644 index 0000000000..de0024a00b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf @@ -0,0 +1,2 @@ +d /var/db/iscsi 0700 root root - - +C /etc/iscsi - - - - /usr/share/iscsi 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.3.ebuild index d7ff6b5250..997c97fca9 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.3.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,8 +37,9 @@ PATCHES=( pkg_setup() { linux-info_pkg_setup + # Flatcar: use ewarn instead of die if kernel_is -lt 2 6 16; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + ewarn "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 @@ -46,34 +47,19 @@ 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! - 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} )" + CONFIG_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" 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)" + for module in ${CONFIG_CHECK_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 + sed -e 's:^node.startup = manual:node.startup = automatic:' \ + -i etc/iscsid.conf || die default pushd iscsiuio >/dev/null || die @@ -87,9 +73,9 @@ src_configure() { } 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="" \ + use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI + + CFLAGS="" \ emake \ OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \ AR="$(tc-getAR)" CC="$(tc-getCC)" \ @@ -98,21 +84,15 @@ src_compile() { } src_install() { - emake DESTDIR="${ED}" sbindir="/usr/sbin" install + emake DESTDIR="${D}" sbindir="/usr/sbin" install # Upstream make is not deterministic, per bug #601514 - rm -f "${ED}"/etc/initiatorname.iscsi + rm -f "${D}"/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 @@ -122,19 +102,10 @@ src_install() { 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 -} - -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 + rm "${D}"/etc/iscsi/initiatorname.iscsi + mv "${D}"/etc/iscsi "${D}"/usr/share/iscsi }