| 1 |
commit: cf57bf37514572a8c126e2c840c45cd66fb81ba8 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 2 21:42:36 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 2 21:43:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf57bf37 |
| 7 |
|
| 8 |
sys-fs/multipath-tools: bump to v0.8.3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-fs/multipath-tools/Manifest | 1 + |
| 14 |
.../multipath-tools-0.8.3-no-gziped-docs.patch | 175 +++++++++++++++++++++ |
| 15 |
.../multipath-tools/multipath-tools-0.8.3.ebuild | 89 +++++++++++ |
| 16 |
3 files changed, 265 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest |
| 19 |
index 827222b72f6..fa9c2ed1f14 100644 |
| 20 |
--- a/sys-fs/multipath-tools/Manifest |
| 21 |
+++ b/sys-fs/multipath-tools/Manifest |
| 22 |
@@ -2,3 +2,4 @@ DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590 |
| 23 |
DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c |
| 24 |
DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14 SHA512 1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947 |
| 25 |
DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755 SHA512 c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9 |
| 26 |
+DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae |
| 27 |
|
| 28 |
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..534a8d33df8 |
| 31 |
--- /dev/null |
| 32 |
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch |
| 33 |
@@ -0,0 +1,175 @@ |
| 34 |
+Do not gzip docs |
| 35 |
+ |
| 36 |
+--- a/kpartx/Makefile |
| 37 |
++++ b/kpartx/Makefile |
| 38 |
+@@ -21,7 +21,6 @@ all: $(EXEC) |
| 39 |
+ |
| 40 |
+ $(EXEC): $(OBJS) |
| 41 |
+ $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) |
| 42 |
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 43 |
+ |
| 44 |
+ install: $(EXEC) $(EXEC).8 |
| 45 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 46 |
+@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8 |
| 47 |
+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules |
| 48 |
+ $(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules |
| 49 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) |
| 50 |
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) |
| 51 |
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir) |
| 52 |
+ |
| 53 |
+ uninstall: |
| 54 |
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC) |
| 55 |
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz |
| 56 |
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 |
| 57 |
+ $(RM) $(DESTDIR)$(libudevdir)/kpartx_id |
| 58 |
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules |
| 59 |
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules |
| 60 |
+--- a/libdmmp/Makefile |
| 61 |
++++ b/libdmmp/Makefile |
| 62 |
+@@ -40,7 +40,7 @@ install: |
| 63 |
+ $(DESTDIR)$(pkgconfdir)/$(PKGFILE) |
| 64 |
+ perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ |
| 65 |
+ $(DESTDIR)$(pkgconfdir)/$(PKGFILE) |
| 66 |
+- @for file in docs/man/*.3.gz; do \ |
| 67 |
++ @for file in docs/man/*.3; do \ |
| 68 |
+ $(INSTALL_PROGRAM) -m 644 -D \ |
| 69 |
+ $$file \ |
| 70 |
+ $(DESTDIR)$(man3dir)/ || exit $?; \ |
| 71 |
+@@ -69,11 +69,11 @@ check: all |
| 72 |
+ speed_test: all |
| 73 |
+ $(MAKE) -C test speed_test |
| 74 |
+ |
| 75 |
+-doc: docs/man/$(EXTRA_MAN_FILES).gz |
| 76 |
++doc: docs/man/$(EXTRA_MAN_FILES) |
| 77 |
+ |
| 78 |
+ TEMPFILE := $(shell mktemp) |
| 79 |
+ |
| 80 |
+-docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS) |
| 81 |
++docs/man/$(EXTRA_MAN_FILES): $(HEADERS) |
| 82 |
+ @for file in $(EXTRA_MAN_FILES); do \ |
| 83 |
+ $(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \ |
| 84 |
+ done |
| 85 |
+@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS) |
| 86 |
+ perl docs/kernel-doc -man "$(TEMPFILE)" | \ |
| 87 |
+ perl docs/split-man.pl docs/man |
| 88 |
+ -rm -f "$(TEMPFILE)" |
| 89 |
+- @for file in docs/man/*.3; do \ |
| 90 |
+- gzip -f $$file; \ |
| 91 |
+- done |
| 92 |
+- find docs/man -type f -name \*[0-9].gz |
| 93 |
++ find docs/man -type f -name \*.[0-9] |
| 94 |
+ |
| 95 |
+ dep_clean: |
| 96 |
+ $(RM) $(OBJS:.o=.d) |
| 97 |
+--- a/libmpathpersist/Makefile |
| 98 |
++++ b/libmpathpersist/Makefile |
| 99 |
+@@ -16,8 +16,6 @@ all: $(LIBS) |
| 100 |
+ $(LIBS): $(OBJS) |
| 101 |
+ $(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS) |
| 102 |
+ $(LN) $(LIBS) $(DEVLIB) |
| 103 |
+- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz |
| 104 |
+- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz |
| 105 |
+ |
| 106 |
+ install: $(LIBS) |
| 107 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) |
| 108 |
+@@ -26,14 +24,14 @@ install: $(LIBS) |
| 109 |
+ $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir) |
| 110 |
+ $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir) |
| 111 |
+ $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) |
| 112 |
+- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir) |
| 113 |
+- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir) |
| 114 |
++ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir) |
| 115 |
++ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir) |
| 116 |
+ $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir) |
| 117 |
+ |
| 118 |
+ uninstall: |
| 119 |
+ $(RM) $(DESTDIR)$(syslibdir)/$(LIBS) |
| 120 |
+- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz |
| 121 |
+- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz |
| 122 |
++ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3 |
| 123 |
++ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3 |
| 124 |
+ $(RM) $(DESTDIR)$(includedir)/mpath_persist.h |
| 125 |
+ $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB) |
| 126 |
+ |
| 127 |
+--- a/mpathpersist/Makefile |
| 128 |
++++ b/mpathpersist/Makefile |
| 129 |
+@@ -14,13 +14,12 @@ all: $(EXEC) |
| 130 |
+ |
| 131 |
+ $(EXEC): $(OBJS) |
| 132 |
+ $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS) |
| 133 |
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 134 |
+ |
| 135 |
+ install: |
| 136 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 137 |
+ $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
| 138 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) |
| 139 |
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) |
| 140 |
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir) |
| 141 |
+ |
| 142 |
+ clean: dep_clean |
| 143 |
+ $(RM) core *.o $(EXEC) *.gz |
| 144 |
+@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d)) |
| 145 |
+ |
| 146 |
+ uninstall: |
| 147 |
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC) |
| 148 |
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz |
| 149 |
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 |
| 150 |
+ |
| 151 |
+ dep_clean: |
| 152 |
+ $(RM) $(OBJS:.o=.d) |
| 153 |
+--- a/multipath/Makefile |
| 154 |
++++ b/multipath/Makefile |
| 155 |
+@@ -16,8 +16,6 @@ all: $(EXEC) |
| 156 |
+ |
| 157 |
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so |
| 158 |
+ $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) |
| 159 |
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 160 |
+- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz |
| 161 |
+ |
| 162 |
+ install: |
| 163 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 164 |
+@@ -26,16 +24,16 @@ install: |
| 165 |
+ $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) |
| 166 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules |
| 167 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) |
| 168 |
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) |
| 169 |
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir) |
| 170 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) |
| 171 |
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) |
| 172 |
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) |
| 173 |
+ |
| 174 |
+ uninstall: |
| 175 |
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC) |
| 176 |
+ $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules |
| 177 |
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules |
| 178 |
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz |
| 179 |
+- $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz |
| 180 |
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 |
| 181 |
++ $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5 |
| 182 |
+ |
| 183 |
+ clean: dep_clean |
| 184 |
+ $(RM) core *.o $(EXEC) *.gz |
| 185 |
+--- a/multipathd/Makefile |
| 186 |
++++ b/multipathd/Makefile |
| 187 |
+@@ -34,7 +34,6 @@ all : $(EXEC) |
| 188 |
+ |
| 189 |
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so |
| 190 |
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS) |
| 191 |
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 192 |
+ |
| 193 |
+ install: |
| 194 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 195 |
+@@ -45,11 +44,11 @@ ifdef SYSTEMD |
| 196 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir) |
| 197 |
+ endif |
| 198 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) |
| 199 |
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) |
| 200 |
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir) |
| 201 |
+ |
| 202 |
+ uninstall: |
| 203 |
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC) |
| 204 |
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz |
| 205 |
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 |
| 206 |
+ $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service |
| 207 |
+ $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket |
| 208 |
+ |
| 209 |
|
| 210 |
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3.ebuild |
| 211 |
new file mode 100644 |
| 212 |
index 00000000000..8be358bc905 |
| 213 |
--- /dev/null |
| 214 |
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3.ebuild |
| 215 |
@@ -0,0 +1,89 @@ |
| 216 |
+# Copyright 1999-2019 Gentoo Authors |
| 217 |
+# Distributed under the terms of the GNU General Public License v2 |
| 218 |
+ |
| 219 |
+EAPI="7" |
| 220 |
+ |
| 221 |
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs |
| 222 |
+ |
| 223 |
+DESCRIPTION="Device mapper target autoconfig" |
| 224 |
+HOMEPAGE="http://christophe.varoqui.free.fr/" |
| 225 |
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" |
| 226 |
+ |
| 227 |
+LICENSE="GPL-2" |
| 228 |
+SLOT="0" |
| 229 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
| 230 |
+IUSE="systemd rbd" |
| 231 |
+ |
| 232 |
+RDEPEND=" |
| 233 |
+ dev-libs/json-c:= |
| 234 |
+ dev-libs/libaio |
| 235 |
+ dev-libs/userspace-rcu:= |
| 236 |
+ >=sys-fs/lvm2-2.02.45 |
| 237 |
+ >=virtual/udev-171 |
| 238 |
+ sys-libs/readline:0= |
| 239 |
+ rbd? ( sys-cluster/ceph ) |
| 240 |
+ systemd? ( sys-apps/systemd ) |
| 241 |
+" |
| 242 |
+DEPEND="${RDEPEND}" |
| 243 |
+BDEPEND=" |
| 244 |
+ virtual/pkgconfig |
| 245 |
+" |
| 246 |
+ |
| 247 |
+CONFIG_CHECK="~DM_MULTIPATH" |
| 248 |
+ |
| 249 |
+RESTRICT="test" |
| 250 |
+ |
| 251 |
+PATCHES=( |
| 252 |
+ "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch |
| 253 |
+ "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch |
| 254 |
+) |
| 255 |
+ |
| 256 |
+get_systemd_pv() { |
| 257 |
+ use systemd && \ |
| 258 |
+ $(tc-getPKG_CONFIG) --modversion systemd |
| 259 |
+} |
| 260 |
+ |
| 261 |
+src_prepare() { |
| 262 |
+ default |
| 263 |
+ |
| 264 |
+ # The upstream lacks any way to configure the build at present |
| 265 |
+ # and ceph is a huge dependency, so we're using sed to make it |
| 266 |
+ # optional until the upstream has a proper configure system |
| 267 |
+ if ! use rbd ; then |
| 268 |
+ sed \ |
| 269 |
+ -e "s/libcheckrbd.so/# libcheckrbd.so/" \ |
| 270 |
+ -e "s/-lrados//" \ |
| 271 |
+ -i libmultipath/checkers/Makefile \ |
| 272 |
+ || die |
| 273 |
+ fi |
| 274 |
+} |
| 275 |
+ |
| 276 |
+src_compile() { |
| 277 |
+ # LIBDM_API_FLUSH involves grepping files in /usr/include, |
| 278 |
+ # so force the test to go the way we want #411337. |
| 279 |
+ emake \ |
| 280 |
+ CC="$(tc-getCC)" \ |
| 281 |
+ LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" |
| 282 |
+} |
| 283 |
+ |
| 284 |
+src_install() { |
| 285 |
+ dodir /sbin /usr/share/man/man{5,8} |
| 286 |
+ emake \ |
| 287 |
+ DESTDIR="${D}" \ |
| 288 |
+ SYSTEMD=$(get_systemd_pv) \ |
| 289 |
+ unitdir="$(systemd_get_systemunitdir)" \ |
| 290 |
+ libudevdir='${prefix}'/"$(get_udevdir)" \ |
| 291 |
+ install |
| 292 |
+ |
| 293 |
+ newinitd "${FILESDIR}"/rc-multipathd multipathd |
| 294 |
+ newinitd "${FILESDIR}"/multipath.rc multipath |
| 295 |
+ |
| 296 |
+ einstalldocs |
| 297 |
+} |
| 298 |
+ |
| 299 |
+pkg_postinst() { |
| 300 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
| 301 |
+ elog "If you need multipath on your system, you must" |
| 302 |
+ elog "add 'multipath' into your boot runlevel!" |
| 303 |
+ fi |
| 304 |
+} |
Archives