commit: 19bb7cb9303bb3f4e349eee23c0a38309d7bf9d6 Author: Alec Moskvin <alecm <AT> gmx <DOT> com> AuthorDate: Tue May 3 22:18:46 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 3 22:45:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19bb7cb9
sys-block/open-iscsi: Use placeholder susbstitution from Makefile Closes: https://bugs.gentoo.org/842498 Signed-off-by: Alec Moskvin <alecm <AT> gmx.com> Closes: https://github.com/gentoo/gentoo/pull/25309 Signed-off-by: Sam James <sam <AT> gentoo.org> ...csi-2.1.6.ebuild => open-iscsi-2.1.6-r1.ebuild} | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild similarity index 87% rename from sys-block/open-iscsi/open-iscsi-2.1.6.ebuild rename to sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild index 8dd972425a4e..1c8341739a41 100644 --- a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools linux-info flag-o-matic toolchain-funcs systemd +inherit autotools linux-info flag-o-matic toolchain-funcs DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" HOMEPAGE="https://www.open-iscsi.com/"; @@ -69,10 +69,6 @@ pkg_setup() { } src_prepare() { - sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \ - -i etc/iscsid.conf || die - sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \ - -i etc/systemd/iscsi* || die default pushd iscsiuio >/dev/null || die @@ -98,7 +94,12 @@ src_compile() { } src_install() { - emake DESTDIR="${ED}" sbindir="/usr/sbin" SED="${EPREFIX}/bin/sed" install + emake \ + DESTDIR="${ED}" \ + sbindir="/usr/sbin" \ + SED="${EPREFIX}/bin/sed" \ + systemddir="${EPREFIX}/lib/systemd" \ + install install_systemd # Upstream make is not deterministic, per bug #601514 rm -f "${ED}"/etc/initiatorname.iscsi @@ -114,16 +115,6 @@ src_install() { newconfd "${FILESDIR}"/iscsid-conf.d iscsid newinitd "${FILESDIR}"/iscsid-init.d iscsid - local unit - local units=( - iscsi{,-init}.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
