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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2DE69139694 for ; Wed, 2 Aug 2017 06:35:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97F1A1FC08B; Wed, 2 Aug 2017 06:35:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65D711FC08B for ; Wed, 2 Aug 2017 06:35:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41B7D34178E for ; Wed, 2 Aug 2017 06:35:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0974775DD for ; Wed, 2 Aug 2017 06:35:15 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1501655711.1135f7811bd9d5c1ba2ae36070e20c69b1dff07f.polynomial-c@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.6.4-r1.ebuild X-VCS-Directories: sys-fs/multipath-tools/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 1135f7811bd9d5c1ba2ae36070e20c69b1dff07f X-VCS-Branch: master Date: Wed, 2 Aug 2017 06:35:15 +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-Archives-Salt: ff6a5e41-36b1-4e96-b25d-02c5a3563be6 X-Archives-Hash: a3ecda13a1bbe23251f6f7f6bbbfa713 commit: 1135f7811bd9d5c1ba2ae36070e20c69b1dff07f Author: Lars Wendler gentoo org> AuthorDate: Wed Aug 2 06:28:38 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Aug 2 06:35:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1135f781 sys-fs/multipath-tools: Revbump to fix bug #624884 Package-Manager: Portage-2.3.6, Repoman-2.3.3 Signed-off-by: Lars Wendler gentoo.org> .../multipath-tools-0.6.4-r1.ebuild | 99 ++++++++++++++++++++++ 1 file changed, 99 insertions(+) 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 new file mode 100644 index 00000000000..652a8f6a1a6 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=">=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + dev-libs/libaio + dev-libs/userspace-rcu + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( + # modprobe fails when modules are compiled statically into the kernel + # https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html + "${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=604228 + # https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html + "${FILESDIR}"/${P}-sysmacros.patch +) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # Fix for bug #624884 + if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then + sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die + else + elog "DM_TABLE_STATE sed hack is no longer necessary." + fi + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +}