1 |
commit: 2953ae544c1f20301c7017c2323b167a8287d8c2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 15 09:49:30 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 15 09:49:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2953ae54 |
7 |
|
8 |
sys-fs/multipath-tools: Removed old |
9 |
|
10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/multipath-tools/Manifest | 2 - |
14 |
...path-tools-0.6.2-ignore-modprobe-failures.patch | 25 ------ |
15 |
.../files/multipath-tools-0.6.4-sysmacros.patch | 60 ------------- |
16 |
.../multipath-tools-0.6.4-r1.ebuild | 99 ---------------------- |
17 |
.../multipath-tools/multipath-tools-0.7.9.ebuild | 94 -------------------- |
18 |
5 files changed, 280 deletions(-) |
19 |
|
20 |
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest |
21 |
index b6fc606d5e1..dd78e5e9f42 100644 |
22 |
--- a/sys-fs/multipath-tools/Manifest |
23 |
+++ b/sys-fs/multipath-tools/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea |
26 |
-DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c |
27 |
DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae |
28 |
DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307 |
29 |
|
30 |
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch |
31 |
deleted file mode 100644 |
32 |
index cb785899c2e..00000000000 |
33 |
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch |
34 |
+++ /dev/null |
35 |
@@ -1,25 +0,0 @@ |
36 |
-From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001 |
37 |
-From: Mike Gilbert <floppym@g.o> |
38 |
-Date: Mon, 12 Sep 2016 17:26:38 -0400 |
39 |
-Subject: [PATCH] multipathd.service: ignore modprobe failures |
40 |
- |
41 |
---- |
42 |
- multipathd/multipathd.service | 2 +- |
43 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
44 |
- |
45 |
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service |
46 |
-index e3d6f91..d26577f 100644 |
47 |
---- a/multipathd/multipathd.service |
48 |
-+++ b/multipathd/multipathd.service |
49 |
-@@ -11,7 +11,7 @@ Conflicts=shutdown.target |
50 |
- Type=notify |
51 |
- NotifyAccess=main |
52 |
- LimitCORE=infinity |
53 |
--ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath |
54 |
-+ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath |
55 |
- ExecStart=/sbin/multipathd -d -s |
56 |
- ExecReload=/sbin/multipathd reconfigure |
57 |
- |
58 |
--- |
59 |
-2.10.0 |
60 |
- |
61 |
|
62 |
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch |
63 |
deleted file mode 100644 |
64 |
index 99a12fc7b78..00000000000 |
65 |
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch |
66 |
+++ /dev/null |
67 |
@@ -1,60 +0,0 @@ |
68 |
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c |
69 |
-index 1206e45..f50c1bd 100644 |
70 |
---- a/kpartx/dasd.c |
71 |
-+++ b/kpartx/dasd.c |
72 |
-@@ -28,6 +28,7 @@ |
73 |
- #include <inttypes.h> |
74 |
- #include <sys/types.h> |
75 |
- #include <sys/stat.h> |
76 |
-+#include <sys/sysmacros.h> |
77 |
- #include <sys/ioctl.h> |
78 |
- #include <linux/hdreg.h> |
79 |
- #include <errno.h> |
80 |
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c |
81 |
-index d31fea8..3452787 100644 |
82 |
---- a/kpartx/kpartx.c |
83 |
-+++ b/kpartx/kpartx.c |
84 |
-@@ -28,6 +28,7 @@ |
85 |
- #include <stdint.h> |
86 |
- #include <sys/ioctl.h> |
87 |
- #include <sys/stat.h> |
88 |
-+#include <sys/sysmacros.h> |
89 |
- #include <sys/types.h> |
90 |
- #include <ctype.h> |
91 |
- #include <libdevmapper.h> |
92 |
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c |
93 |
-index 4d6c3c2..d9a9e67 100644 |
94 |
---- a/libmultipath/checkers/tur.c |
95 |
-+++ b/libmultipath/checkers/tur.c |
96 |
-@@ -11,6 +11,7 @@ |
97 |
- #include <unistd.h> |
98 |
- #include <fcntl.h> |
99 |
- #include <sys/ioctl.h> |
100 |
-+#include <sys/sysmacros.h> |
101 |
- #include <errno.h> |
102 |
- #include <sys/time.h> |
103 |
- #include <pthread.h> |
104 |
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c |
105 |
-index 4f8ef13..9c0b240 100644 |
106 |
---- a/libmultipath/devmapper.c |
107 |
-+++ b/libmultipath/devmapper.c |
108 |
-@@ -12,6 +12,7 @@ |
109 |
- #include <ctype.h> |
110 |
- #include <unistd.h> |
111 |
- #include <errno.h> |
112 |
-+#include <sys/sysmacros.h> |
113 |
- |
114 |
- #include "checkers.h" |
115 |
- #include "vector.h" |
116 |
-diff --git a/libmultipath/util.c b/libmultipath/util.c |
117 |
-index 03a5738..1841f35 100644 |
118 |
---- a/libmultipath/util.c |
119 |
-+++ b/libmultipath/util.c |
120 |
-@@ -4,6 +4,7 @@ |
121 |
- #include <pthread.h> |
122 |
- #include <string.h> |
123 |
- #include <sys/stat.h> |
124 |
-+#include <sys/sysmacros.h> |
125 |
- #include <sys/types.h> |
126 |
- #include <unistd.h> |
127 |
- |
128 |
|
129 |
diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild |
130 |
deleted file mode 100644 |
131 |
index 59c081dc6d9..00000000000 |
132 |
--- a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild |
133 |
+++ /dev/null |
134 |
@@ -1,99 +0,0 @@ |
135 |
-# Copyright 1999-2018 Gentoo Authors |
136 |
-# Distributed under the terms of the GNU General Public License v2 |
137 |
- |
138 |
-EAPI=6 |
139 |
- |
140 |
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs |
141 |
- |
142 |
-DESCRIPTION="Device mapper target autoconfig" |
143 |
-HOMEPAGE="http://christophe.varoqui.free.fr/" |
144 |
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" |
145 |
- |
146 |
-LICENSE="GPL-2" |
147 |
-SLOT="0" |
148 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86" |
149 |
-IUSE="systemd rbd" |
150 |
- |
151 |
-RDEPEND=">=sys-fs/lvm2-2.02.45 |
152 |
- >=virtual/udev-171 |
153 |
- dev-libs/libaio |
154 |
- dev-libs/userspace-rcu:= |
155 |
- sys-libs/readline:0= |
156 |
- rbd? ( sys-cluster/ceph ) |
157 |
- systemd? ( sys-apps/systemd )" |
158 |
-DEPEND="${RDEPEND} |
159 |
- virtual/pkgconfig" |
160 |
- |
161 |
-CONFIG_CHECK="~DM_MULTIPATH" |
162 |
- |
163 |
-PATCHES=( |
164 |
- # modprobe fails when modules are compiled statically into the kernel |
165 |
- # https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html |
166 |
- "${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch |
167 |
- |
168 |
- # https://bugs.gentoo.org/show_bug.cgi?id=604228 |
169 |
- # https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html |
170 |
- "${FILESDIR}"/${P}-sysmacros.patch |
171 |
-) |
172 |
- |
173 |
-get_systemd_pv() { |
174 |
- use systemd && \ |
175 |
- $(tc-getPKG_CONFIG) --modversion systemd |
176 |
-} |
177 |
- |
178 |
-pkg_pretend() { |
179 |
- linux-info_pkg_setup |
180 |
-} |
181 |
- |
182 |
-pkg_setup() { |
183 |
- linux-info_pkg_setup |
184 |
-} |
185 |
- |
186 |
-src_prepare() { |
187 |
- default |
188 |
- |
189 |
- # Fix for bug #624884 |
190 |
- if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then |
191 |
- sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die |
192 |
- else |
193 |
- elog "DM_TABLE_STATE sed hack is no longer necessary." |
194 |
- fi |
195 |
- |
196 |
- # The upstream lacks any way to configure the build at present |
197 |
- # and ceph is a huge dependency, so we're using sed to make it |
198 |
- # optional until the upstream has a proer configure system |
199 |
- if ! use rbd ; then |
200 |
- sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile |
201 |
- sed -i -e "s/-lrados//" libmultipath/checkers/Makefile |
202 |
- fi |
203 |
-} |
204 |
- |
205 |
-src_compile() { |
206 |
- # LIBDM_API_FLUSH involves grepping files in /usr/include, |
207 |
- # so force the test to go the way we want #411337. |
208 |
- emake \ |
209 |
- CC="$(tc-getCC)" \ |
210 |
- LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" |
211 |
-} |
212 |
- |
213 |
-src_install() { |
214 |
- dodir /sbin /usr/share/man/man{5,8} |
215 |
- emake \ |
216 |
- DESTDIR="${D}" \ |
217 |
- SYSTEMD=$(get_systemd_pv) \ |
218 |
- unitdir="$(systemd_get_systemunitdir)" \ |
219 |
- libudevdir='${prefix}'/"$(get_udevdir)" \ |
220 |
- install |
221 |
- |
222 |
- newinitd "${FILESDIR}"/rc-multipathd multipathd |
223 |
- newinitd "${FILESDIR}"/multipath.rc multipath |
224 |
- |
225 |
- einstalldocs |
226 |
-} |
227 |
- |
228 |
-pkg_postinst() { |
229 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
230 |
- elog "If you need multipath on your system, you must" |
231 |
- elog "add 'multipath' into your boot runlevel!" |
232 |
- fi |
233 |
-} |
234 |
|
235 |
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild |
236 |
deleted file mode 100644 |
237 |
index c4898d34da4..00000000000 |
238 |
--- a/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild |
239 |
+++ /dev/null |
240 |
@@ -1,94 +0,0 @@ |
241 |
-# Copyright 1999-2018 Gentoo Authors |
242 |
-# Distributed under the terms of the GNU General Public License v2 |
243 |
- |
244 |
-EAPI="6" |
245 |
- |
246 |
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs |
247 |
- |
248 |
-DESCRIPTION="Device mapper target autoconfig" |
249 |
-HOMEPAGE="http://christophe.varoqui.free.fr/" |
250 |
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" |
251 |
- |
252 |
-LICENSE="GPL-2" |
253 |
-SLOT="0" |
254 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
255 |
-IUSE="systemd rbd" |
256 |
- |
257 |
-RDEPEND=" |
258 |
- dev-libs/json-c:= |
259 |
- dev-libs/libaio |
260 |
- dev-libs/userspace-rcu:= |
261 |
- >=sys-fs/lvm2-2.02.45 |
262 |
- >=virtual/udev-171 |
263 |
- sys-libs/readline:0= |
264 |
- rbd? ( sys-cluster/ceph ) |
265 |
- systemd? ( sys-apps/systemd ) |
266 |
-" |
267 |
-DEPEND=" |
268 |
- ${RDEPEND} |
269 |
- virtual/pkgconfig |
270 |
-" |
271 |
- |
272 |
-CONFIG_CHECK="~DM_MULTIPATH" |
273 |
- |
274 |
-RESTRICT="test" |
275 |
- |
276 |
-PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch ) |
277 |
- |
278 |
-get_systemd_pv() { |
279 |
- use systemd && \ |
280 |
- $(tc-getPKG_CONFIG) --modversion systemd |
281 |
-} |
282 |
- |
283 |
-pkg_pretend() { |
284 |
- linux-info_pkg_setup |
285 |
-} |
286 |
- |
287 |
-pkg_setup() { |
288 |
- linux-info_pkg_setup |
289 |
-} |
290 |
- |
291 |
-src_prepare() { |
292 |
- default |
293 |
- |
294 |
- # The upstream lacks any way to configure the build at present |
295 |
- # and ceph is a huge dependency, so we're using sed to make it |
296 |
- # optional until the upstream has a proper configure system |
297 |
- if ! use rbd ; then |
298 |
- sed \ |
299 |
- -e "s/libcheckrbd.so/# libcheckrbd.so/" \ |
300 |
- -e "s/-lrados//" \ |
301 |
- -i libmultipath/checkers/Makefile \ |
302 |
- || die |
303 |
- fi |
304 |
-} |
305 |
- |
306 |
-src_compile() { |
307 |
- # LIBDM_API_FLUSH involves grepping files in /usr/include, |
308 |
- # so force the test to go the way we want #411337. |
309 |
- emake \ |
310 |
- CC="$(tc-getCC)" \ |
311 |
- LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" |
312 |
-} |
313 |
- |
314 |
-src_install() { |
315 |
- dodir /sbin /usr/share/man/man{5,8} |
316 |
- emake \ |
317 |
- DESTDIR="${D}" \ |
318 |
- SYSTEMD=$(get_systemd_pv) \ |
319 |
- unitdir="$(systemd_get_systemunitdir)" \ |
320 |
- libudevdir='${prefix}'/"$(get_udevdir)" \ |
321 |
- install |
322 |
- |
323 |
- newinitd "${FILESDIR}"/rc-multipathd multipathd |
324 |
- newinitd "${FILESDIR}"/multipath.rc multipath |
325 |
- |
326 |
- einstalldocs |
327 |
-} |
328 |
- |
329 |
-pkg_postinst() { |
330 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
331 |
- elog "If you need multipath on your system, you must" |
332 |
- elog "add 'multipath' into your boot runlevel!" |
333 |
- fi |
334 |
-} |