diff options
Diffstat (limited to 'sys-fs/multipath-tools')
| -rw-r--r-- | sys-fs/multipath-tools/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch | 31 | ||||
| -rw-r--r-- | sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild | 105 |
3 files changed, 139 insertions, 0 deletions
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 46818f931e07..b8febd225516 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,5 +1,8 @@ +AUX multipath-tools-0.9.4-test-fix.patch 1258 BLAKE2B 3b381e1e0690edf77503e2774651fb1c8a58348821e089315db71054fbf8c8a8cee68c037b52c43cd3703c5e42254a63d7b562b13f19b9809edff630404b2d2c SHA512 f24b75a6d0b198c2639d4933b89c48a9530563b399e8554e0349bb7848acb4197a55541ddab588d120e92cac00725ab7a029c438813b666a78f8d7a6c5ec8753 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da +DIST multipath-tools-0.9.4.tar.gz 554381 BLAKE2B 297f002e23312415467d8c4935da3b7f449318cd68120c719f40f0f45a9ebebc27f1297b918068b63471b65f72c08ce3cc6cad9b7bafcb646bb163c6486194ea SHA512 5e0dcea610fc215e345444c04453a38f39c73e493c2bc53f6b3a90cd701266aabdf7c4693dfc321099af836d0019bf27355e265ad5db5deff48f8bb94ed4719d EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 4e00be11956c5b7afc44dcad8e608b312a44aade65971951e48faa7fb1d492e84fa285548ad9740018e7ec4b49ecae29638989f03f3d6cbdb47d9d6ded201072 SHA512 9b99079b9090b73b2c8154cd389579919c1bdfd9275f01af679c244436a07bf969c12264655658a19e145cc496d7954a780ade5e6b2d53ca2bf80b0606a0da1a +EBUILD multipath-tools-0.9.4.ebuild 2138 BLAKE2B ad219653716ab00064e4c93405dfd0125a0d531831ef14fbaafdfea85763d7f21ba578d3409dbb09c9f7b5fdac36a0ddc911d9021a55cde7040052960e0c087f SHA512 3aa527439968a83d48e1ba312f47cd9424f9d21b3dd3d7cce83dfd763d10be3e0796c1e10702fdd8287fed2dd264ab3c91e0df33d5e26d62f71b3aa8913e2775 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch new file mode 100644 index 000000000000..c0469a20d122 --- /dev/null +++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch @@ -0,0 +1,31 @@ +https://listman.redhat.com/archives/dm-devel/2023-March/053587.html + +From 2ebbff587e80f3f153b934d3cfcccb8a4bb21568 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 23 Mar 2023 08:04:49 +0000 +Subject: [PATCH] tests: fix quoting of CFLAGS in Makefile + +Otherwise, when CFLAGS/CPPFLAGS have multiple entries (like "-O2 -pipe"), we +get an error: +``` +make[1]: Entering directory '/var/tmp/portage/sys-fs/multipath-tools-0.9.4/work/multipath-tools-0.9.4/tests' +/bin/sh: line 1: -pipe: command not found +make[1]: *** [Makefile:115: libmultipath.so.0] Error 127 +make[1]: *** Waiting for unfinished jobs.... +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -112,7 +112,7 @@ dep_clean: + # Pass the original values of CFLAGS etc. to the sub-make, which will include + # Makefile.in again. Otherwise, the flags would be added twice. + libmultipath.so.0: $(multipathdir)/libmultipath.so.0 +- @CFLAGS=$(ORIG_CFLAGS) CPPFLAGS=$(ORIG_CPPFLAGS) LDFLAGS=$(ORIG_LDFLAGS) \ ++ @CFLAGS="$(ORIG_CFLAGS)" CPPFLAGS="$(ORIG_CPPFLAGS)" LDFLAGS="$(ORIG_LDFLAGS)" \ + $(MAKE) -C $(multipathdir) configdir=$(TESTDIR)/conf.d plugindir=$(TESTDIR)/lib test-lib + + # COLON will get expanded during second expansion below +-- +2.40.0 + diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild new file mode 100644 index 000000000000..a0a952eec775 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info systemd tmpfiles toolchain-funcs udev + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="systemd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/json-c:= + dev-libs/libaio + dev-libs/userspace-rcu:= + >=sys-fs/lvm2-2.02.45 + sys-libs/readline:= + >=virtual/libudev-232-r3 + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) +" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.4-test-fix.patch +) + +myemake() { + local myemakeargs=( + prefix="${EPREFIX}" + LIB="$(get_libdir)" + RUN=run + plugindir="${EPREFIX}/$(get_libdir)/multipath" + unitdir="$(systemd_get_systemunitdir)" + libudevdir="${EPREFIX}/$(get_udevdir)" + pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" + GENTOO_CFLAGS="${CFLAGS}" + GENTOO_CPPFLAGS="${CPPFLAGS}" + FAKEVAR=1 + V=1 + ) + + emake "${myemakeargs[@]}" "$@" +} + +src_prepare() { + default + + sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ + "${S}"/Makefile.inc || die +} + +src_compile() { + tc-export CC + + append-flags -Wno-error + + myemake +} + +src_test() { + myemake test +} + +src_install() { + dodir /sbin + + myemake DESTDIR="${ED}" install + + rmdir "${ED}"/usr/include + rmdir "${ED}"/usr/share + mv "${ED}"/include "${ED}"/usr/include || die + mv "${ED}"/share "${ED}"/usr/share || die + einstalldocs + + newinitd "${FILESDIR}"/multipathd-r1.rc multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf + udev_reload + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} + +pkg_postrm() { + udev_reload +} |