Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/
Date: Thu, 02 Jun 2022 18:43:34
Message-Id: 1654195347.3794bbcd4182d42047b849ee746d8a25beb9ea78.tamiko@gentoo
1 commit: 3794bbcd4182d42047b849ee746d8a25beb9ea78
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 2 18:42:27 2022 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 2 18:42:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3794bbcd
7
8 sys-block/open-iscsi: fix installation
9
10 - use -j1 to avoid a race condition during "make install"
11
12 - move udev rules.d file into right place
13
14 - let docompress handle compressing man pages
15
16 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
17
18 sys-block/open-iscsi/open-iscsi-2.1.7.ebuild | 12 +++++++++++-
19 1 file changed, 11 insertions(+), 1 deletion(-)
20
21 diff --git a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
22 index 3bf611eea398..08efea3d8711 100644
23 --- a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
24 +++ b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
25 @@ -95,7 +95,8 @@ src_compile() {
26 }
27
28 src_install() {
29 - emake \
30 + # Force serial install to avoid race conditions
31 + emake -j1 \
32 DESTDIR="${ED}" \
33 sbindir="/usr/sbin" \
34 SED="${EPREFIX}/bin/sed" \
35 @@ -105,6 +106,15 @@ src_install() {
36 # Upstream make is not deterministic, per bug #601514
37 rm -f "${ED}"/etc/initiatorname.iscsi
38
39 + # QA: install udev rule into right place
40 + mkdir -p "${ED}"/lib/udev/rules.d
41 + mv "${ED}"/etc/udev/rules.d/50-iscsi-firmware-login.rules \
42 + "${ED}"/lib/udev/rules.d || die "mv failed"
43 +
44 + # QA: let docompress compress man pages
45 + gunzip -r "${ED}"/usr/share/man/man3/ || die "gunzip failed"
46 + gunzip -r "${ED}"/usr/share/man/man8/ || die "gunzip failed"
47 +
48 dodoc README THANKS
49
50 docinto test/