commit: 6cdf612eaa66301433e726371ddf804df44c4f31
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 1 15:24:47 2021 +0000
Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 15:24:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdf612e
sys-cluster/rdma-core: Fix iwpmd init script installation
iwpmd binary depends on USE="neigh", make iwpmd init script
installation conditional too
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
.../rdma-core/{rdma-core-9999.ebuild => rdma-core-32.0-r1.ebuild} | 6 +++---
.../rdma-core/{rdma-core-9999.ebuild => rdma-core-33.0-r1.ebuild} | 7 +++----
sys-cluster/rdma-core/rdma-core-9999.ebuild | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild
b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
similarity index 93%
copy from sys-cluster/rdma-core/rdma-core-9999.ebuild
copy to sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
index 04f071dfb37..f8daeb64452 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core";
else
SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc
x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390
~sparc ~x86"
fi
LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
@@ -95,9 +95,9 @@ src_install() {
if use neigh; then
newinitd "${FILESDIR}"/ibacm.init ibacm
+ newinitd "${FILESDIR}"/iwpmd.init iwpmd
fi
- newinitd "${FILESDIR}"/iwpmd.init iwpmd
newinitd "${FILESDIR}"/srpd.init srpd
use python && python_optimize
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild
b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
similarity index 93%
copy from sys-cluster/rdma-core/rdma-core-9999.ebuild
copy to sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
index 04f071dfb37..d83a2529ce2 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core";
else
SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc
x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390
~sparc ~x86"
fi
LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
@@ -95,9 +95,8 @@ src_install() {
if use neigh; then
newinitd "${FILESDIR}"/ibacm.init ibacm
+ newinitd "${FILESDIR}"/iwpmd.init iwpmd
fi
-
- newinitd "${FILESDIR}"/iwpmd.init iwpmd
newinitd "${FILESDIR}"/srpd.init srpd
use python && python_optimize
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild
b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index 04f071dfb37..22768de9389 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -95,9 +95,9 @@ src_install() {
if use neigh; then
newinitd "${FILESDIR}"/ibacm.init ibacm
+ newinitd "${FILESDIR}"/iwpmd.init iwpmd
fi
- newinitd "${FILESDIR}"/iwpmd.init iwpmd
newinitd "${FILESDIR}"/srpd.init srpd
use python && python_optimize
