From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F079B158090 for ; Tue, 3 May 2022 22:45:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4906DE076B; Tue, 3 May 2022 22:45:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03152E076B for ; Tue, 3 May 2022 22:45:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35225341361 for ; Tue, 3 May 2022 22:45:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7088287 for ; Tue, 3 May 2022 22:45:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651617907.19bb7cb9303bb3f4e349eee23c0a38309d7bf9d6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild sys-block/open-iscsi/open-iscsi-2.1.6.ebuild X-VCS-Directories: sys-block/open-iscsi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 19bb7cb9303bb3f4e349eee23c0a38309d7bf9d6 X-VCS-Branch: master Date: Tue, 3 May 2022 22:45:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 784a7210-c58a-4bd6-83d4-bb2b049a1d9b X-Archives-Hash: e83e58a6a53044cd47dbf9f3835e9167 commit: 19bb7cb9303bb3f4e349eee23c0a38309d7bf9d6 Author: Alec Moskvin gmx com> AuthorDate: Tue May 3 22:18:46 2022 +0000 Commit: Sam James gentoo 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 gmx.com> Closes: https://github.com/gentoo/gentoo/pull/25309 Signed-off-by: Sam James 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