From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10CEA15800F for ; Wed, 4 Jan 2023 04:56:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 007DDE0788; Wed, 4 Jan 2023 04:56:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9907E0788 for ; Wed, 4 Jan 2023 04:56:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEF9333BEAC for ; Wed, 4 Jan 2023 04:56:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 683AA7FA for ; Wed, 4 Jan 2023 04:56:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672808174.6170bcae6a911697812969d6b4e095d07c740fae.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild X-VCS-Directories: sys-fs/multipath-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6170bcae6a911697812969d6b4e095d07c740fae X-VCS-Branch: master Date: Wed, 4 Jan 2023 04:56:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fe6f45f7-eece-40d2-91ab-92a69df1841f X-Archives-Hash: a3f2d4a857ff867bade7d086990ae229 commit: 6170bcae6a911697812969d6b4e095d07c740fae Author: Sam James gentoo org> AuthorDate: Wed Jan 4 04:54:17 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 4 04:56:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6170bcae sys-fs/multipath-tools: restore 0.9.3-r2 Dropped accidentally. Reported at https://github.com/flatcar/portage-stable/pull/401#issuecomment-1369035847. Fixes: 69322f09c73a949705b50485ab26552491d8a3cd~1 Signed-off-by: Sam James gentoo.org> .../multipath-tools-0.9.3-r2.ebuild | 97 ++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild new file mode 100644 index 000000000000..65869a69983e --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs udev tmpfiles + +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 + >=virtual/libudev-232-r3 + sys-libs/readline:= + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + test? ( dev-util/cmocka )" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +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 + + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + prefix="${EPREFIX}/usr" \ + plugindir="${EPREFIX}/$(get_libdir)/multipath" \ + LIB="$(get_libdir)" \ + LIBDM_API_FLUSH=1 \ + PKGCONFIG="$(tc-getPKG_CONFIG)" \ + GENTOO_CFLAGS="${CFLAGS}" \ + GENTOO_CPPFLAGS="${CPPFLAGS}" \ + FAKEVAR=1 +} + +src_install() { + dodir /sbin + + # Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53 + # $(prefix) doesn't work correctly in makefile in 0.9.3. + emake \ + DESTDIR="${ED}" \ + 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}" \ + 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 +}