1 |
commit: e2d7edeaa92a6e386b57d8bc8a2f3bf7112e5a17 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 4 10:53:55 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 4 10:54:12 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d7edea |
7 |
|
8 |
sys-block/open-iscsi: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-block/open-iscsi/Manifest | 1 - |
14 |
.../open-iscsi-2.0.877-optional_systemd.patch | 87 ------------- |
15 |
.../files/open-iscsi-2.0.877-pkgconfig.patch | 84 ------------- |
16 |
sys-block/open-iscsi/open-iscsi-2.0.877.ebuild | 136 --------------------- |
17 |
4 files changed, 308 deletions(-) |
18 |
|
19 |
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest |
20 |
index c0adee972fc..8d0851454c3 100644 |
21 |
--- a/sys-block/open-iscsi/Manifest |
22 |
+++ b/sys-block/open-iscsi/Manifest |
23 |
@@ -1,6 +1,5 @@ |
24 |
DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b |
25 |
DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 |
26 |
-DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef SHA512 1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6 |
27 |
DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33 |
28 |
DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f SHA512 bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d |
29 |
DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672 SHA512 88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3 |
30 |
|
31 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch |
32 |
deleted file mode 100644 |
33 |
index b1f1a8f1d07..00000000000 |
34 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch |
35 |
+++ /dev/null |
36 |
@@ -1,87 +0,0 @@ |
37 |
-From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001 |
38 |
-From: Lee Duncan <lduncan@××××.com> |
39 |
-Date: Tue, 14 May 2019 13:11:34 -0700 |
40 |
-Subject: [PATCH] Make iscsid systemd usage optional |
41 |
- |
42 |
-You can compile without system now by using something |
43 |
-like: |
44 |
- |
45 |
- make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1 |
46 |
- |
47 |
-This will skip systemd code for iscsid and iscsiuio. |
48 |
---- |
49 |
- Makefile | 5 +++++ |
50 |
- usr/Makefile | 2 ++ |
51 |
- usr/iscsid.c | 6 ++++++ |
52 |
- 3 files changed, 13 insertions(+) |
53 |
- |
54 |
-diff --git a/Makefile b/Makefile |
55 |
-index c941740c..9a337741 100644 |
56 |
---- a/Makefile |
57 |
-+++ b/Makefile |
58 |
-@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS)) |
59 |
- export CFLAGS |
60 |
- endif |
61 |
- |
62 |
-+# export systemd disablement if set |
63 |
-+ifneq ($(NO_SYSTEMD),) |
64 |
-+export NO_SYSTEMD |
65 |
-+endif |
66 |
-+ |
67 |
- # Random comments: |
68 |
- # using '$(MAKE)' instead of just 'make' allows make to run in parallel |
69 |
- # over multiple makefile. |
70 |
-diff --git a/usr/Makefile b/usr/Makefile |
71 |
-index f1c35aa7..0203127c 100644 |
72 |
---- a/usr/Makefile |
73 |
-+++ b/usr/Makefile |
74 |
-@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ |
75 |
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) |
76 |
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr |
77 |
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) |
78 |
-+ifeq ($(NO_SYSTEMD),) |
79 |
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) |
80 |
-+endif |
81 |
- PROGRAMS = iscsid iscsiadm iscsistart |
82 |
- |
83 |
- # libc compat files |
84 |
-diff --git a/usr/iscsid.c b/usr/iscsid.c |
85 |
-index 0c984409..37c13b39 100644 |
86 |
---- a/usr/iscsid.c |
87 |
-+++ b/usr/iscsid.c |
88 |
-@@ -34,7 +34,9 @@ |
89 |
- #include <sys/wait.h> |
90 |
- #include <sys/types.h> |
91 |
- #include <sys/stat.h> |
92 |
-+#ifndef NO_SYSTEMD |
93 |
- #include <systemd/sd-daemon.h> |
94 |
-+#endif |
95 |
- |
96 |
- #include "iscsid.h" |
97 |
- #include "mgmt_ipc.h" |
98 |
-@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file) |
99 |
- /* called right before we enter the event loop */ |
100 |
- static void set_state_to_ready(void) |
101 |
- { |
102 |
-+#ifndef NO_SYSTEMD |
103 |
- if (sessions_to_recover) |
104 |
- sd_notify(0, "READY=1\n" |
105 |
- "RELOADING=1\n" |
106 |
-@@ -346,14 +349,17 @@ static void set_state_to_ready(void) |
107 |
- else |
108 |
- sd_notify(0, "READY=1\n" |
109 |
- "STATUS=Ready to process requests\n"); |
110 |
-+#endif |
111 |
- } |
112 |
- |
113 |
- /* called when recovery process has been reaped */ |
114 |
- static void set_state_done_reloading(void) |
115 |
- { |
116 |
-+#ifndef NO_SYSTEMD |
117 |
- sessions_to_recover = 0; |
118 |
- sd_notifyf(0, "READY=1\n" |
119 |
- "STATUS=Ready to process requests\n"); |
120 |
-+#endif |
121 |
- } |
122 |
- |
123 |
- int main(int argc, char *argv[]) |
124 |
|
125 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch |
126 |
deleted file mode 100644 |
127 |
index 1756196e6b3..00000000000 |
128 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-pkgconfig.patch |
129 |
+++ /dev/null |
130 |
@@ -1,84 +0,0 @@ |
131 |
-From 623a81123c494f5c69dc6616bd72e838862e2f1f Mon Sep 17 00:00:00 2001 |
132 |
-From: Lee Duncan <lduncan@××××.com> |
133 |
-Date: Mon, 12 Nov 2018 13:10:04 -0800 |
134 |
-Subject: [PATCH] Use pkg-config in Makefiles for newer libraries. |
135 |
- |
136 |
-These two recently-added libraries can be in different |
137 |
-locations on different distros, so use pkg-config to |
138 |
-added the appropriate actions in the make files. |
139 |
---- |
140 |
- libopeniscsiusr/Makefile | 8 +++++++- |
141 |
- usr/Makefile | 11 ++++++++--- |
142 |
- 2 files changed, 15 insertions(+), 4 deletions(-) |
143 |
- |
144 |
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile |
145 |
-index bf7c96c7..a045a459 100644 |
146 |
---- a/libopeniscsiusr/Makefile |
147 |
-+++ b/libopeniscsiusr/Makefile |
148 |
-@@ -23,6 +23,8 @@ endif |
149 |
- INCLUDE_DIR ?= $(prefix)/include |
150 |
- PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig |
151 |
- |
152 |
-+PKG_CONFIG = /usr/bin/pkg-config |
153 |
-+ |
154 |
- LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr |
155 |
- |
156 |
- LIBISCSI_USR_VERSION_MAJOR=0 |
157 |
-@@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o |
158 |
- |
159 |
- CFLAGS ?= -O2 -g |
160 |
- CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC |
161 |
-+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) |
162 |
-+ |
163 |
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) |
164 |
- |
165 |
- LIBADD = |
166 |
- |
167 |
- all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc |
168 |
- |
169 |
- $(LIBS): $(OBJS) |
170 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) |
171 |
-+ @echo CFLAGS= $(CFLAGS) |
172 |
-+ $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) |
173 |
- ln -sf $@ $(DEVLIB) |
174 |
- |
175 |
- $(LIBS_MAJOR): $(LIBS) |
176 |
-diff --git a/usr/Makefile b/usr/Makefile |
177 |
-index f9445ada..f1c35aa7 100644 |
178 |
---- a/usr/Makefile |
179 |
-+++ b/usr/Makefile |
180 |
-@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o |
181 |
- endif |
182 |
- endif |
183 |
- |
184 |
-+PKG_CONFIG = /usr/bin/pkg-config |
185 |
-+ |
186 |
- CFLAGS ?= -O2 -g |
187 |
- WARNFLAGS ?= -Wall -Wstrict-prototypes |
188 |
- CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ |
189 |
- -I$(TOPDIR)/libopeniscsiusr |
190 |
-+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) |
191 |
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr |
192 |
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) |
193 |
-+LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) |
194 |
- PROGRAMS = iscsid iscsiadm iscsistart |
195 |
- |
196 |
- # libc compat files |
197 |
-@@ -60,14 +65,14 @@ all: $(PROGRAMS) |
198 |
- |
199 |
- iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ |
200 |
- iscsid.o session_mgmt.o discoveryd.o mntcheck.o |
201 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) |
202 |
-+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) |
203 |
- |
204 |
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o |
205 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) |
206 |
-+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) |
207 |
- |
208 |
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
209 |
- iscsistart.o statics.o |
210 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) |
211 |
-+ $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) |
212 |
- clean: |
213 |
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |
214 |
- |
215 |
|
216 |
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild |
217 |
deleted file mode 100644 |
218 |
index 3c166cfb0a4..00000000000 |
219 |
--- a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild |
220 |
+++ /dev/null |
221 |
@@ -1,136 +0,0 @@ |
222 |
-# Copyright 1999-2019 Gentoo Authors |
223 |
-# Distributed under the terms of the GNU General Public License v2 |
224 |
- |
225 |
-EAPI=7 |
226 |
- |
227 |
-inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd |
228 |
- |
229 |
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" |
230 |
-HOMEPAGE="http://www.open-iscsi.com/" |
231 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
232 |
- |
233 |
-LICENSE="GPL-2" |
234 |
-SLOT="0/0.2" |
235 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
236 |
-IUSE="debug infiniband libressl +tcp rdma systemd" |
237 |
- |
238 |
-DEPEND=" |
239 |
- sys-apps/kmod |
240 |
- sys-block/open-isns:= |
241 |
- sys-kernel/linux-headers |
242 |
- infiniband? ( sys-fabric/ofed ) |
243 |
- !libressl? ( dev-libs/openssl:0= ) |
244 |
- libressl? ( dev-libs/libressl:0= ) |
245 |
- systemd? ( sys-apps/systemd ) |
246 |
-" |
247 |
-RDEPEND="${DEPEND} |
248 |
- sys-fs/lsscsi |
249 |
- sys-apps/util-linux" |
250 |
-BDEPEND="virtual/pkgconfig" |
251 |
- |
252 |
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" |
253 |
- |
254 |
-PATCHES=( |
255 |
- "${FILESDIR}/${PN}-2.0.876-Makefiles.patch" |
256 |
- "${FILESDIR}/${PN}-2.0.877-pkgconfig.patch" |
257 |
- "${FILESDIR}/${PN}-2.0.877-optional_systemd.patch" |
258 |
-) |
259 |
- |
260 |
-pkg_setup() { |
261 |
- linux-info_pkg_setup |
262 |
- |
263 |
- if kernel_is -lt 2 6 16; then |
264 |
- die "Sorry, your kernel must be 2.6.16-rc5 or newer!" |
265 |
- fi |
266 |
- |
267 |
- # Needs to be done, as iscsid currently only starts, when having the iSCSI |
268 |
- # support loaded as module. Kernel builtin options don't work. See this for |
269 |
- # more information: |
270 |
- # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 |
271 |
- # If there's a new release, check whether this is still valid! |
272 |
- TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" |
273 |
- RDMA_MODULES="INFINIBAND_ISER" |
274 |
- INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS" |
275 |
- CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )" |
276 |
- if linux_config_exists; then |
277 |
- if use tcp; then |
278 |
- for module in ${TCP_MODULES}; do |
279 |
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" |
280 |
- done |
281 |
- fi |
282 |
- if use infiniband; then |
283 |
- for module in ${INFINIBAND_MODULES}; do |
284 |
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" |
285 |
- done |
286 |
- fi |
287 |
- if use rdma; then |
288 |
- for module in ${RDMA_MODULES}; do |
289 |
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$ |
290 |
- done |
291 |
- fi |
292 |
- fi |
293 |
-} |
294 |
- |
295 |
-src_prepare() { |
296 |
- sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \ |
297 |
- -i etc/iscsid.conf || die |
298 |
- sed -e 's@\(/sbin/\)@/usr\1@' \ |
299 |
- -i etc/systemd/iscsi* || die |
300 |
- default |
301 |
- |
302 |
- pushd iscsiuio >/dev/null || die |
303 |
- eautoreconf |
304 |
- popd >/dev/null || die |
305 |
-} |
306 |
- |
307 |
-src_configure() { |
308 |
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI |
309 |
- append-lfs-flags |
310 |
-} |
311 |
- |
312 |
-src_compile() { |
313 |
- # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build |
314 |
- # is messed up already here, so it's not making it that much worse. |
315 |
- KSRC="${KV_DIR}" CFLAGS="" \ |
316 |
- emake \ |
317 |
- OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \ |
318 |
- AR="$(tc-getAR)" CC="$(tc-getCC)" \ |
319 |
- $(usex systemd '' NO_SYSTEMD=1) \ |
320 |
- user |
321 |
-} |
322 |
- |
323 |
-src_install() { |
324 |
- emake DESTDIR="${ED}" sbindir="/usr/sbin" install |
325 |
- # Upstream make is not deterministic, per bug #601514 |
326 |
- rm -f "${ED}"/etc/initiatorname.iscsi |
327 |
- |
328 |
- dodoc README THANKS |
329 |
- |
330 |
- docinto test/ |
331 |
- dodoc test/* |
332 |
- |
333 |
- insinto /etc/iscsi |
334 |
- newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example |
335 |
- |
336 |
- newconfd "${FILESDIR}"/iscsid-conf.d iscsid |
337 |
- newinitd "${FILESDIR}"/iscsid-init.d iscsid |
338 |
- |
339 |
- systemd_dounit etc/systemd/iscsi.service |
340 |
- systemd_dounit etc/systemd/iscsid.service |
341 |
- systemd_dounit etc/systemd/iscsid.socket |
342 |
- |
343 |
- keepdir /var/db/iscsi |
344 |
- fperms 700 /var/db/iscsi |
345 |
- fperms 600 /etc/iscsi/iscsid.conf |
346 |
-} |
347 |
- |
348 |
-pkg_postinst() { |
349 |
- in='/etc/iscsi/initiatorname.iscsi' |
350 |
- if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then |
351 |
- { |
352 |
- cat "${EROOT}${in}.example" |
353 |
- echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" |
354 |
- echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" |
355 |
- } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}" |
356 |
- fi |
357 |
-} |