Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/
Date: Sat, 14 Sep 2019 10:34:36
Message-Id: 1568457264.2c20ea19377159043c752e8832dd27c7924a6565.polynomial-c@gentoo
1 commit: 2c20ea19377159043c752e8832dd27c7924a6565
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 10:34:24 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 10:34:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c20ea19
7
8 sys-block/open-iscsi: Removed old
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-block/open-iscsi/Manifest | 2 -
14 sys-block/open-iscsi/open-iscsi-2.0.876.ebuild | 121 --------------------
15 .../open-iscsi-2.0.876_p20180814-r1.ebuild | 126 ---------------------
16 3 files changed, 249 deletions(-)
17
18 diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
19 index d768d940499..95b2f1b9341 100644
20 --- a/sys-block/open-iscsi/Manifest
21 +++ b/sys-block/open-iscsi/Manifest
22 @@ -1,6 +1,4 @@
23 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
24 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
25 -DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
26 -DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc SHA512 d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
27 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
28 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
29
30 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild
31 deleted file mode 100644
32 index 2f34ac971b3..00000000000
33 --- a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild
34 +++ /dev/null
35 @@ -1,121 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev systemd
42 -
43 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
44 -HOMEPAGE="http://www.open-iscsi.com/"
45 -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
46 -
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
50 -IUSE="debug infiniband +tcp rdma"
51 -
52 -DEPEND="sys-block/open-isns:=
53 - infiniband? ( sys-fabric/ofed )
54 - sys-kernel/linux-headers"
55 -RDEPEND="${DEPEND}
56 - sys-fs/lsscsi
57 - sys-apps/util-linux"
58 -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
59 -
60 -PATCHES=(
61 - "${FILESDIR}/${PN}-2.0.876-musl-fixes.patch"
62 - "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
63 -)
64 -
65 -pkg_setup() {
66 - linux-info_pkg_setup
67 -
68 - if kernel_is -lt 2 6 16; then
69 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
70 - fi
71 -
72 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
73 - # support loaded as module. Kernel builtin options don't work. See this for
74 - # more information:
75 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
76 - # If there's a new release, check whether this is still valid!
77 - TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
78 - RDMA_MODULES="INFINIBAND_ISER"
79 - INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
80 - CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
81 - if linux_config_exists; then
82 - if use tcp; then
83 - for module in ${TCP_MODULES}; do
84 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
85 - done
86 - fi
87 - if use infiniband; then
88 - for module in ${INFINIBAND_MODULES}; do
89 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
90 - done
91 - fi
92 - if use rdma; then
93 - for module in ${RDMA_MODULES}; do
94 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
95 - done
96 - fi
97 - fi
98 -}
99 -
100 -src_prepare() {
101 - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
102 - default
103 -
104 - pushd iscsiuio >/dev/null || die
105 - eautoreconf
106 - popd >/dev/null || die
107 -}
108 -
109 -src_configure() {
110 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
111 - append-lfs-flags
112 -}
113 -
114 -src_compile() {
115 - # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
116 - # is messed up already here, so it's not making it that much worse.
117 - KSRC="${KV_DIR}" CFLAGS="" \
118 - emake \
119 - OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
120 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
121 - user
122 -}
123 -
124 -src_install() {
125 - emake DESTDIR="${ED}" sbindir="/usr/sbin" install
126 - # Upstream make is not deterministic, per bug #601514
127 - rm -f "${ED}"/etc/initiatorname.iscsi
128 -
129 - dodoc README THANKS
130 -
131 - docinto test/
132 - dodoc test/*
133 -
134 - insinto /etc/iscsi
135 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
136 -
137 - newconfd "${FILESDIR}"/iscsid-conf.d iscsid
138 - newinitd "${FILESDIR}"/iscsid-init.d iscsid
139 -
140 - systemd_dounit "${S%/}"/etc/systemd/iscsid.service
141 -
142 - keepdir /var/db/iscsi
143 - fperms 700 /var/db/iscsi
144 - fperms 600 /etc/iscsi/iscsid.conf
145 -}
146 -
147 -pkg_postinst() {
148 - in='/etc/iscsi/initiatorname.iscsi'
149 - if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
150 - {
151 - cat "${EROOT}${in}.example"
152 - echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
153 - echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
154 - } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
155 - fi
156 -}
157
158 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
159 deleted file mode 100644
160 index 8d18bfc1ed4..00000000000
161 --- a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
162 +++ /dev/null
163 @@ -1,126 +0,0 @@
164 -# Copyright 1999-2019 Gentoo Authors
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI="6"
168 -
169 -inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
170 -
171 -MY_COMMIT="96c1a8e344d93594a3bb4faa848f878cc7315bde"
172 -
173 -DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
174 -HOMEPAGE="http://www.open-iscsi.com/"
175 -SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
176 -
177 -LICENSE="GPL-2"
178 -SLOT="0/0.2"
179 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
180 -IUSE="debug infiniband +tcp rdma"
181 -
182 -DEPEND="sys-block/open-isns:=
183 - infiniband? ( sys-fabric/ofed )
184 - sys-kernel/linux-headers"
185 -RDEPEND="${DEPEND}
186 - sys-fs/lsscsi
187 - sys-apps/util-linux"
188 -REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
189 -
190 -PATCHES=(
191 - "${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch"
192 - "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
193 - "${FILESDIR}/${PN}-2.0.876-space_in_node-mode.patch" #685190
194 -)
195 -
196 -S="${WORKDIR}/${PN}-${MY_COMMIT}"
197 -
198 -pkg_setup() {
199 - linux-info_pkg_setup
200 -
201 - if kernel_is -lt 2 6 16; then
202 - die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
203 - fi
204 -
205 - # Needs to be done, as iscsid currently only starts, when having the iSCSI
206 - # support loaded as module. Kernel builtin options don't work. See this for
207 - # more information:
208 - # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
209 - # If there's a new release, check whether this is still valid!
210 - TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
211 - RDMA_MODULES="INFINIBAND_ISER"
212 - INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
213 - CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
214 - if linux_config_exists; then
215 - if use tcp; then
216 - for module in ${TCP_MODULES}; do
217 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
218 - done
219 - fi
220 - if use infiniband; then
221 - for module in ${INFINIBAND_MODULES}; do
222 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
223 - done
224 - fi
225 - if use rdma; then
226 - for module in ${RDMA_MODULES}; do
227 - linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
228 - done
229 - fi
230 - fi
231 -}
232 -
233 -src_prepare() {
234 - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
235 - default
236 -
237 - pushd iscsiuio >/dev/null || die
238 - eautoreconf
239 - popd >/dev/null || die
240 -}
241 -
242 -src_configure() {
243 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
244 - append-lfs-flags
245 -}
246 -
247 -src_compile() {
248 - # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
249 - # is messed up already here, so it's not making it that much worse.
250 - KSRC="${KV_DIR}" CFLAGS="" \
251 - emake \
252 - OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
253 - AR="$(tc-getAR)" CC="$(tc-getCC)" \
254 - user
255 -}
256 -
257 -src_install() {
258 - emake DESTDIR="${ED}" sbindir="/usr/sbin" install
259 - # Upstream make is not deterministic, per bug #601514
260 - rm -f "${ED}"/etc/initiatorname.iscsi
261 -
262 - dodoc README THANKS
263 -
264 - docinto test/
265 - dodoc test/*
266 -
267 - insinto /etc/iscsi
268 - newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
269 -
270 - newconfd "${FILESDIR}"/iscsid-conf.d iscsid
271 - newinitd "${FILESDIR}"/iscsid-init.d iscsid
272 -
273 - systemd_dounit "${S%/}"/etc/systemd/iscsid.service
274 -
275 - keepdir /var/db/iscsi
276 - fperms 700 /var/db/iscsi
277 - fperms 600 /etc/iscsi/iscsid.conf
278 -}
279 -
280 -pkg_postinst() {
281 - in='/etc/iscsi/initiatorname.iscsi'
282 - if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
283 - {
284 - cat "${EROOT}${in}.example"
285 - echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
286 - echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
287 - } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
288 - fi
289 -}