1 |
commit: c7b256b6031ef57750155576dc1281d621bff44a |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 7 15:13:10 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 21 11:37:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b256b6 |
7 |
|
8 |
sys-block/open-iscsi: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
.../open-iscsi/files/open-iscsi-2.0.872-conf.d | 18 --- |
14 |
.../open-iscsi-2.0.872-dont-call-configure.patch | 11 -- |
15 |
.../files/open-iscsi-2.0.872-glibc212.patch | 10 -- |
16 |
.../open-iscsi/files/open-iscsi-2.0.872-init.d-r1 | 130 --------------------- |
17 |
.../files/open-iscsi-2.0.872-isns-slp.patch | 16 --- |
18 |
.../files/open-iscsi-2.0.872-ldflags.patch | 11 -- |
19 |
...open-iscsi-2.0.872-makefile-cleanup-pass2.patch | 55 --------- |
20 |
.../open-iscsi-2.0.872-makefile-cleanup.patch | 20 ---- |
21 |
8 files changed, 271 deletions(-) |
22 |
|
23 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d b/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d |
24 |
deleted file mode 100644 |
25 |
index 02e584fbce5..00000000000 |
26 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d |
27 |
+++ /dev/null |
28 |
@@ -1,18 +0,0 @@ |
29 |
-# /etc/conf.d/iscsid |
30 |
- |
31 |
-# config file to use |
32 |
-CONFIG_FILE=/etc/iscsi/iscsid.conf |
33 |
- |
34 |
-# you need to specify an initiatorname in the file |
35 |
-INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi |
36 |
- |
37 |
-# options to pass to iscsid |
38 |
-OPTS="-i ${INITIATORNAME_FILE}" |
39 |
- |
40 |
-# Start automatic targets when iscsid is started |
41 |
-AUTOSTARTTARGETS="yes" |
42 |
- |
43 |
-# if set to "strict", iscsid will stop, if connecting the |
44 |
-# autostart targets failed |
45 |
-# AUTOSTART="strict" |
46 |
- |
47 |
|
48 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch |
49 |
deleted file mode 100644 |
50 |
index 185f1acd837..00000000000 |
51 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch |
52 |
+++ /dev/null |
53 |
@@ -1,11 +0,0 @@ |
54 |
---- open-iscsi-2.0-872.orig/Makefile |
55 |
-+++ open-iscsi-2.0-872/Makefile |
56 |
-@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example |
57 |
- all: user kernel |
58 |
- |
59 |
- user: ; |
60 |
-- cd utils/open-isns; ./configure; $(MAKE) |
61 |
-+ cd utils/open-isns; $(MAKE) |
62 |
- $(MAKE) -C utils/sysdeps |
63 |
- $(MAKE) -C utils/fwparam_ibft |
64 |
- $(MAKE) -C usr |
65 |
|
66 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch |
67 |
deleted file mode 100644 |
68 |
index 61717032940..00000000000 |
69 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch |
70 |
+++ /dev/null |
71 |
@@ -1,10 +0,0 @@ |
72 |
---- usr/iscsid.c 2010-10-10 23:06:37.000000000 +0200 |
73 |
-+++ usr/iscsid.c 2010-10-10 23:07:55.000000000 +0200 |
74 |
-@@ -31,6 +31,7 @@ |
75 |
- #include <sys/utsname.h> |
76 |
- #include <sys/types.h> |
77 |
- #include <sys/wait.h> |
78 |
-+#include <sys/stat.h> |
79 |
- |
80 |
- #include "iscsid.h" |
81 |
- #include "mgmt_ipc.h" |
82 |
|
83 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 b/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 |
84 |
deleted file mode 100644 |
85 |
index 597d0804feb..00000000000 |
86 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 |
87 |
+++ /dev/null |
88 |
@@ -1,130 +0,0 @@ |
89 |
-#!/sbin/openrc-run |
90 |
-# Copyright 1999-2013 Gentoo Foundation, Inc. |
91 |
-# Distributed under the terms of the GNU General Public License, v2 or later |
92 |
- |
93 |
-opts="${opts} starttargets stoptargets restarttargets" |
94 |
- |
95 |
-depend() { |
96 |
- after modules |
97 |
- use net |
98 |
-} |
99 |
- |
100 |
-PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid} |
101 |
-BINARY="/usr/sbin/iscsid" |
102 |
- |
103 |
-checkconfig() { |
104 |
- if [ ! -e /etc/conf.d/${SVCNAME} ]; then |
105 |
- eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" |
106 |
- return 1 |
107 |
- fi |
108 |
- if [ ! -e "${CONFIG_FILE}" ]; then |
109 |
- eerror "Config file ${CONFIG_FILE} does not exist!" |
110 |
- return 1 |
111 |
- fi |
112 |
- if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then |
113 |
- ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name." |
114 |
- IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi |
115 |
- IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g') |
116 |
- ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" |
117 |
- echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}" |
118 |
- eend $? |
119 |
- fi |
120 |
-} |
121 |
- |
122 |
-do_modules() { |
123 |
- msg="$1" |
124 |
- shift |
125 |
- modules="${1}" |
126 |
- shift |
127 |
- modopts="$@" |
128 |
- for m in ${modules} |
129 |
- do |
130 |
- if modprobe --show --quiet "${m}" |
131 |
- then |
132 |
- ebegin "${msg} ${m}" |
133 |
- modprobe ${modopts} ${m} |
134 |
- ret=$? |
135 |
- eend ${ret} |
136 |
- if [ ${ret} -ne 0 ]; then |
137 |
- return ${ret} |
138 |
- fi |
139 |
- else |
140 |
- ebegin "${msg} ${m}: not found" |
141 |
- return 1 |
142 |
- fi |
143 |
- done |
144 |
- return 0 |
145 |
-} |
146 |
- |
147 |
-start() { |
148 |
- ebegin "Checking open-iSCSI configuration" |
149 |
- checkconfig |
150 |
- ret=$? |
151 |
- if [ $ret -ne 0 ]; then |
152 |
- eend 1 |
153 |
- return 1 |
154 |
- fi |
155 |
- ebegin "Loading iSCSI modules" |
156 |
- do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp' |
157 |
- ret=$? |
158 |
- if [ $ret -ne 0 ]; then |
159 |
- eend 1 |
160 |
- return 1 |
161 |
- fi |
162 |
- |
163 |
- ebegin "Starting ${SVCNAME}" |
164 |
- start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS} |
165 |
- ret=$? |
166 |
- if [ $ret -ne 0 ]; then |
167 |
- eend $? |
168 |
- return $? |
169 |
- fi |
170 |
- |
171 |
- # Start automatic targets when iscsid is started |
172 |
- if [ "${AUTOSTARTTARGETS}" = "yes" ]; then |
173 |
- starttargets |
174 |
- ret=$? |
175 |
- if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then |
176 |
- stop |
177 |
- return $ret |
178 |
- fi |
179 |
- fi |
180 |
- return 0 |
181 |
-} |
182 |
- |
183 |
-stop() { |
184 |
- stoptargets |
185 |
- ebegin "Stopping ${SVCNAME}" |
186 |
- start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE} |
187 |
- eend $? |
188 |
- |
189 |
- do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r' |
190 |
- eend $? |
191 |
-} |
192 |
- |
193 |
-starttargets() { |
194 |
- ebegin "Setting up iSCSI targets" |
195 |
- /usr/sbin/iscsiadm -m node --loginall=automatic |
196 |
- ret=$? |
197 |
- eend $ret |
198 |
- return $ret |
199 |
-} |
200 |
- |
201 |
-stoptargets() { |
202 |
- ebegin "Disconnecting iSCSI targets" |
203 |
- sync |
204 |
- /usr/sbin/iscsiadm -m node --logoutall=all |
205 |
- ret=$? |
206 |
- eend $ret |
207 |
- return $ret |
208 |
-} |
209 |
- |
210 |
-restarttargets() { |
211 |
- stoptargets |
212 |
- starttargets |
213 |
-} |
214 |
- |
215 |
-status() { |
216 |
- ebegin "Showing current active iSCSI sessions" |
217 |
- /usr/sbin/iscsiadm -m session |
218 |
-} |
219 |
|
220 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch |
221 |
deleted file mode 100644 |
222 |
index db280a3dd86..00000000000 |
223 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch |
224 |
+++ /dev/null |
225 |
@@ -1,16 +0,0 @@ |
226 |
-diff -Nuar open-iscsi-2.0-872.orig/usr/Makefile open-iscsi-2.0-872/usr/Makefile |
227 |
---- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:25:13.656604152 +0000 |
228 |
-+++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:26:28.960171260 +0000 |
229 |
-@@ -53,10 +53,10 @@ |
230 |
- |
231 |
- iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ |
232 |
- iscsid.o session_mgmt.o discoveryd.o |
233 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto |
234 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto |
235 |
- |
236 |
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o |
237 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto |
238 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto |
239 |
- |
240 |
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
241 |
- iscsistart.o statics.o |
242 |
|
243 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch |
244 |
deleted file mode 100644 |
245 |
index fc02cbcc1ec..00000000000 |
246 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch |
247 |
+++ /dev/null |
248 |
@@ -1,11 +0,0 @@ |
249 |
---- utils/Makefile 2011-05-31 01:30:27.302609540 +0200 |
250 |
-+++ utils/Makefile 2011-05-31 01:32:50.229602790 +0200 |
251 |
-@@ -6,7 +6,7 @@ |
252 |
- all: $(PROGRAMS) |
253 |
- |
254 |
- iscsi-iname: md5.o iscsi-iname.o |
255 |
-- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ |
256 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ |
257 |
- |
258 |
- clean: |
259 |
- rm -f *.o $(PROGRAMS) .depend |
260 |
|
261 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch |
262 |
deleted file mode 100644 |
263 |
index fb563d10e1b..00000000000 |
264 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch |
265 |
+++ /dev/null |
266 |
@@ -1,55 +0,0 @@ |
267 |
-diff -NuarwbB open-iscsi-2.0-872/usr/Makefile open-iscsi-2.0-872.orig/usr/Makefile |
268 |
---- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:58:04.402623915 +0000 |
269 |
-+++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:56:51.159070006 +0000 |
270 |
-@@ -65,6 +65,6 @@ |
271 |
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |
272 |
- |
273 |
- depend: |
274 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
275 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
276 |
- |
277 |
- -include .depend |
278 |
-diff -NuarwbB open-iscsi-2.0-872/utils/fwparam_ibft/Makefile open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile |
279 |
---- open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile 2012-02-09 08:57:58.579273051 +0000 |
280 |
-+++ open-iscsi-2.0-872/utils/fwparam_ibft/Makefile 2010-08-11 15:27:07.000000000 +0000 |
281 |
-@@ -38,6 +38,6 @@ |
282 |
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h |
283 |
- |
284 |
- depend: |
285 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
286 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
287 |
- |
288 |
- -include .depend |
289 |
-diff -NuarwbB open-iscsi-2.0-872/utils/Makefile open-iscsi-2.0-872.orig/utils/Makefile |
290 |
---- open-iscsi-2.0-872.orig/utils/Makefile 2012-02-09 08:57:37.825877235 +0000 |
291 |
-+++ open-iscsi-2.0-872/utils/Makefile 2012-02-09 08:56:51.145736633 +0000 |
292 |
-@@ -12,6 +12,6 @@ |
293 |
- rm -f *.o $(PROGRAMS) .depend |
294 |
- |
295 |
- depend: |
296 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
297 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
298 |
- |
299 |
- -include .depend |
300 |
-diff -NuarwbB open-iscsi-2.0-872/utils/open-isns/Makefile.in open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in |
301 |
---- open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in 2012-02-09 08:57:47.812573971 +0000 |
302 |
-+++ open-iscsi-2.0-872/utils/open-isns/Makefile.in 2010-08-11 15:27:07.000000000 +0000 |
303 |
-@@ -77,6 +77,6 @@ |
304 |
- ar cr $@ $(LIBOBJS) |
305 |
- |
306 |
- depend: |
307 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
308 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
309 |
- |
310 |
- -include .depend |
311 |
-diff -NuarwbB open-iscsi-2.0-872/utils/sysdeps/Makefile open-iscsi-2.0-872.orig/utils/sysdeps/Makefile |
312 |
---- open-iscsi-2.0-872.orig/utils/sysdeps/Makefile 2012-02-09 08:57:43.459227530 +0000 |
313 |
-+++ open-iscsi-2.0-872/utils/sysdeps/Makefile 2010-08-11 15:27:07.000000000 +0000 |
314 |
-@@ -10,6 +10,6 @@ |
315 |
- rm -f *.o .depend |
316 |
- |
317 |
- depend: |
318 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
319 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
320 |
- |
321 |
- -include .depend |
322 |
|
323 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch |
324 |
deleted file mode 100644 |
325 |
index b3e93f459fc..00000000000 |
326 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch |
327 |
+++ /dev/null |
328 |
@@ -1,20 +0,0 @@ |
329 |
---- usr/Makefile 2010-10-10 22:48:04.000000000 +0200 |
330 |
-+++ usr/Makefile.ori 2010-10-10 22:48:34.000000000 +0200 |
331 |
-@@ -53,14 +53,14 @@ |
332 |
- |
333 |
- iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ |
334 |
- iscsid.o session_mgmt.o discoveryd.o |
335 |
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto |
336 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto |
337 |
- |
338 |
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o |
339 |
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto |
340 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto |
341 |
- |
342 |
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
343 |
- iscsistart.o statics.o |
344 |
-- $(CC) $(CFLAGS) -static $^ -o $@ |
345 |
-+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ |
346 |
- clean: |
347 |
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |
348 |
- |