1 |
commit: 8f8b158508c54c33a20832cafc637da709773f31 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 2 14:53:44 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 2 14:53:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8b1585 |
7 |
|
8 |
sys-block/open-iscsi: Bump to v2.0.875 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-block/open-iscsi/Manifest | 1 + |
13 |
.../open-iscsi-2.0.875-include-sysmacros.patch | 21 ++++ |
14 |
sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 122 +++++++++++++++++++++ |
15 |
3 files changed, 144 insertions(+) |
16 |
|
17 |
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest |
18 |
index 8a7aef4797d..c32070244d8 100644 |
19 |
--- a/sys-block/open-iscsi/Manifest |
20 |
+++ b/sys-block/open-iscsi/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 |
23 |
DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b |
24 |
DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae |
25 |
+DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 |
26 |
|
27 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..7c19a1e6ba2 |
30 |
--- /dev/null |
31 |
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch |
32 |
@@ -0,0 +1,21 @@ |
33 |
+From 6d68ef5871c94c6ebbbe6e6b1fe0bc2dce711052 Mon Sep 17 00:00:00 2001 |
34 |
+From: Lee Duncan <lduncan@××××.com> |
35 |
+Date: Sat, 2 Dec 2017 14:19:26 -0800 |
36 |
+Subject: [PATCH] Include <sys/sysmacros.h> to properly define minor() |
37 |
+ |
38 |
+--- |
39 |
+ iscsiuio/src/unix/libs/qedi.c | 1 + |
40 |
+ 1 file changed, 1 insertion(+) |
41 |
+ |
42 |
+diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c |
43 |
+index c6ff6e77..b81fecdf 100644 |
44 |
+--- a/iscsiuio/src/unix/libs/qedi.c |
45 |
++++ b/iscsiuio/src/unix/libs/qedi.c |
46 |
+@@ -58,6 +58,7 @@ |
47 |
+ #include <sys/user.h> |
48 |
+ #include <fcntl.h> |
49 |
+ #include <unistd.h> |
50 |
++#include <sys/sysmacros.h> |
51 |
+ |
52 |
+ #include "config.h" |
53 |
+ |
54 |
|
55 |
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..cb09a91bbcd |
58 |
--- /dev/null |
59 |
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild |
60 |
@@ -0,0 +1,122 @@ |
61 |
+# Copyright 1999-2018 Gentoo Foundation |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=6 |
65 |
+ |
66 |
+inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev systemd |
67 |
+ |
68 |
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" |
69 |
+HOMEPAGE="http://www.open-iscsi.com/" |
70 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
71 |
+ |
72 |
+LICENSE="GPL-2" |
73 |
+SLOT="0" |
74 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
75 |
+IUSE="debug infiniband +tcp rdma" |
76 |
+ |
77 |
+DEPEND="sys-block/open-isns:= |
78 |
+ infiniband? ( sys-fabric/ofed )" |
79 |
+RDEPEND="${DEPEND} |
80 |
+ sys-fs/lsscsi |
81 |
+ sys-apps/util-linux" |
82 |
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" |
83 |
+ |
84 |
+PATCHES=( |
85 |
+ "${FILESDIR}/${PN}-2.0.874-Makefiles.patch" |
86 |
+ "${FILESDIR}/${PN}-2.0.874-musl-fixes.patch" |
87 |
+ "${FILESDIR}/${PN}-2.0.874-musl-ethtool-compat.patch" |
88 |
+ "${FILESDIR}/${P}-include-sysmacros.patch" |
89 |
+) |
90 |
+ |
91 |
+pkg_setup() { |
92 |
+ linux-info_pkg_setup |
93 |
+ |
94 |
+ if kernel_is -lt 2 6 16; then |
95 |
+ die "Sorry, your kernel must be 2.6.16-rc5 or newer!" |
96 |
+ fi |
97 |
+ |
98 |
+ # Needs to be done, as iscsid currently only starts, when having the iSCSI |
99 |
+ # support loaded as module. Kernel builtin options don't work. See this for |
100 |
+ # more information: |
101 |
+ # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 |
102 |
+ # If there's a new release, check whether this is still valid! |
103 |
+ TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" |
104 |
+ RDMA_MODULES="INFINIBAND_ISER" |
105 |
+ INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS" |
106 |
+ CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )" |
107 |
+ if linux_config_exists; then |
108 |
+ if use tcp; then |
109 |
+ for module in ${TCP_MODULES}; do |
110 |
+ linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" |
111 |
+ done |
112 |
+ fi |
113 |
+ if use infiniband; then |
114 |
+ for module in ${INFINIBAND_MODULES}; do |
115 |
+ linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" |
116 |
+ done |
117 |
+ fi |
118 |
+ if use rdma; then |
119 |
+ for module in ${RDMA_MODULES}; do |
120 |
+ linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$ |
121 |
+ done |
122 |
+ fi |
123 |
+ fi |
124 |
+} |
125 |
+ |
126 |
+src_prepare() { |
127 |
+ sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die |
128 |
+ default |
129 |
+ |
130 |
+ pushd iscsiuio >/dev/null || die |
131 |
+ eautoreconf |
132 |
+ popd >/dev/null || die |
133 |
+} |
134 |
+ |
135 |
+src_configure() { |
136 |
+ use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI |
137 |
+ append-lfs-flags |
138 |
+} |
139 |
+ |
140 |
+src_compile() { |
141 |
+ # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build |
142 |
+ # is messed up already here, so it's not making it that much worse. |
143 |
+ KSRC="${KV_DIR}" CFLAGS="" \ |
144 |
+ emake \ |
145 |
+ OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
146 |
+ AR="$(tc-getAR)" CC="$(tc-getCC)" \ |
147 |
+ user |
148 |
+} |
149 |
+ |
150 |
+src_install() { |
151 |
+ emake DESTDIR="${ED}" sbindir="/usr/sbin" install |
152 |
+ # Upstream make is not deterministic, per bug #601514 |
153 |
+ rm -f "${ED}"/etc/initiatorname.iscsi |
154 |
+ |
155 |
+ dodoc README THANKS |
156 |
+ |
157 |
+ docinto test/ |
158 |
+ dodoc test/* |
159 |
+ |
160 |
+ insinto /etc/iscsi |
161 |
+ newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example |
162 |
+ |
163 |
+ newconfd "${FILESDIR}"/iscsid-conf.d iscsid |
164 |
+ newinitd "${FILESDIR}"/iscsid-init.d iscsid |
165 |
+ |
166 |
+ systemd_dounit "${S%/}"/etc/systemd/iscsid.service |
167 |
+ |
168 |
+ keepdir /var/db/iscsi |
169 |
+ fperms 700 /var/db/iscsi |
170 |
+ fperms 600 /etc/iscsi/iscsid.conf |
171 |
+} |
172 |
+ |
173 |
+pkg_postinst() { |
174 |
+ in='/etc/iscsi/initiatorname.iscsi' |
175 |
+ if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then |
176 |
+ { |
177 |
+ cat "${EROOT}${in}.example" |
178 |
+ echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" |
179 |
+ echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" |
180 |
+ } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}" |
181 |
+ fi |
182 |
+} |