diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /sys-block/open-iscsi | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'sys-block/open-iscsi')
| -rw-r--r-- | sys-block/open-iscsi/Manifest | 2 | ||||
| -rw-r--r-- | sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild (renamed from sys-block/open-iscsi/open-iscsi-2.1.6.ebuild) | 21 |
2 files changed, 7 insertions, 16 deletions
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index b2e4b08eadb4..e368820e1d47 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -6,5 +6,5 @@ AUX open-iscsi-2.1.6-Makefiles.patch 3157 BLAKE2B 160e0c6c85d40bdd12561695dda6db DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 DIST open-iscsi-2.1.6.tar.gz 623721 BLAKE2B c7c09e38fd10bd5c2a5e8ad8030cf2338de3382fe4acae0e3c1bf3cacb6e244e411b7556403e0c43fd03035836f46cc4836683188e2f159cd7fc066aef78a868 SHA512 4a32a76c1c32d7d1a01fe3a0f88ce9616a54323ec043757be73051eb41ebae8de90ce057acce72fb6fe07aa47e814c9bc6ee88b13fa7d7769ca10c5175974f1d EBUILD open-iscsi-2.1.4-r2.ebuild 3995 BLAKE2B cde9eedfd0adce665015ced51a9a6a83c6d4e163ebcd3578c4733b9816829d815db0d0c11a502be52c15a9ec1ea47a4b248a1ed4d44e9939096281b8fc69b0e8 SHA512 7a3fa0b2296478e1fe7b00f73b6aa7dc6117781958835d6e9f038e7b6cd2b22e4ae53c78543addc69bba1079238d7b455260ce825d6ef6792865323202735896 -EBUILD open-iscsi-2.1.6.ebuild 4078 BLAKE2B e63858cff9007270a0bcee0f304225d045c0b9ce4fd95926df0582d94231f3a6d77845419bf0b4b2cdc9281ed24747a7b0d646283c4612e761b787317bfdbc49 SHA512 64973842c34c506f1ea4a2068bf221effe435c707e72e95c44f570fb5fa4833987256371ae2f33f246c9f7046caace4c6cc992d9b0e3dfe5f7280c5a899b3655 +EBUILD open-iscsi-2.1.6-r1.ebuild 3799 BLAKE2B 4f03566c748d8db7db690ec8ec716a7c01d27bc6a646c4348ab590d6e91837b85aa1b388efe2f45382ea2c4437abebd071df9259568ad80e43f0b9424977f9bd SHA512 517b3a2d0e6d262e73569fd0d8ddf2699530c0bf00a6eb7a04ef1a7e46fb25a34079470ed86c53ac38681e9cf9016c228b88c357effa2ee9207ea1ab74d238b6 MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4 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 index 8dd972425a4e..576fdc85f330 100644 --- a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild @@ -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="$(systemd_get_utildir)" \ + 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 |