| 1 |
commit: 675f058f4e0cc4c59288dc3d49f92274ff7bbfe9 |
| 2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 3 |
AuthorDate: Fri Dec 24 01:12:29 2021 +0000 |
| 4 |
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 5 |
CommitDate: Fri Dec 24 01:32:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=675f058f |
| 7 |
|
| 8 |
sys-kernel/rte_kni-kmod: add pyelfutils to DEPEND |
| 9 |
|
| 10 |
fix crazy python dependency chaos |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 13 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
| 14 |
|
| 15 |
net-libs/dpdk/dpdk-21.11.ebuild | 10 +++++----- |
| 16 |
sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild | 14 +++++++++++--- |
| 17 |
2 files changed, 16 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-libs/dpdk/dpdk-21.11.ebuild b/net-libs/dpdk/dpdk-21.11.ebuild |
| 20 |
index a09a4bc53..de5f926df 100644 |
| 21 |
--- a/net-libs/dpdk/dpdk-21.11.ebuild |
| 22 |
+++ b/net-libs/dpdk/dpdk-21.11.ebuild |
| 23 |
@@ -21,7 +21,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 24 |
RESTRICT="test" |
| 25 |
|
| 26 |
DEPEND="${PYTHON_DEPS} |
| 27 |
- ~sys-kernel/rte_kni-kmod-${PV} |
| 28 |
+ $(python_gen_cond_dep ' |
| 29 |
+ dev-python/pyelftools[${PYTHON_USEDEP}] |
| 30 |
+ ') |
| 31 |
+ ~sys-kernel/rte_kni-kmod-${PV}[${PYTHON_SINGLE_USEDEP}] |
| 32 |
app-crypt/intel-ipsec-mb |
| 33 |
dev-libs/elfutils |
| 34 |
dev-libs/isa-l |
| 35 |
@@ -38,12 +41,10 @@ DEPEND="${PYTHON_DEPS} |
| 36 |
RDEPEND="${DEPEND}" |
| 37 |
BDEPEND=" |
| 38 |
dev-lang/nasm |
| 39 |
- test? ( $(python_gen_cond_dep ' |
| 40 |
- dev-python/pyelftools[${PYTHON_USEDEP}] |
| 41 |
- ') ) |
| 42 |
" |
| 43 |
|
| 44 |
src_configure() { |
| 45 |
+ python-single-r1_pkg_setup |
| 46 |
local emesonargs=( |
| 47 |
-Denable_kmods=false |
| 48 |
-Dmachine=default |
| 49 |
@@ -51,7 +52,6 @@ src_configure() { |
| 50 |
$(meson_use test tests) |
| 51 |
) |
| 52 |
meson_src_configure |
| 53 |
- python_setup |
| 54 |
} |
| 55 |
|
| 56 |
src_install() { |
| 57 |
|
| 58 |
diff --git a/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild b/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild |
| 59 |
index 7bef3eaa9..6e7423e34 100644 |
| 60 |
--- a/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild |
| 61 |
+++ b/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild |
| 62 |
@@ -4,7 +4,7 @@ |
| 63 |
EAPI=7 |
| 64 |
|
| 65 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 66 |
-inherit linux-mod python-any-r1 meson |
| 67 |
+inherit linux-mod python-single-r1 meson |
| 68 |
|
| 69 |
DESCRIPTION="DPDK Kernel Nic Interface module" |
| 70 |
HOMEPAGE="https://dpdk.org/" |
| 71 |
@@ -14,9 +14,15 @@ S="${WORKDIR}/dpdk-${PV}" |
| 72 |
LICENSE="BSD GPL-2" |
| 73 |
SLOT="0" |
| 74 |
KEYWORDS="~amd64" |
| 75 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 76 |
|
| 77 |
-DEPEND=" |
| 78 |
+DEPEND="${PYTHON_DEPS} |
| 79 |
+ $(python_gen_cond_dep ' |
| 80 |
+ dev-python/pyelftools[${PYTHON_USEDEP}] |
| 81 |
+ ') |
| 82 |
+ app-crypt/intel-ipsec-mb |
| 83 |
dev-libs/elfutils |
| 84 |
+ dev-libs/isa-l |
| 85 |
dev-libs/jansson |
| 86 |
dev-libs/libbpf |
| 87 |
dev-libs/libbsd |
| 88 |
@@ -35,10 +41,12 @@ CONFIG_CHECK="~IOMMU_SUPPORT ~AMD_IOMMU ~VFIO ~VFIO_PCI ~UIO ~UIO_PDRV_GENIRQ ~U |
| 89 |
|
| 90 |
pkg_setup() { |
| 91 |
linux-mod_pkg_setup |
| 92 |
- python-any-r1_pkg_setup |
| 93 |
+ python-single-r1_pkg_setup |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
| 97 |
+ linux-mod_pkg_setup |
| 98 |
+ python-single-r1_pkg_setup |
| 99 |
# we still have to do meson configuration as it creates |
| 100 |
# header files needed for compiling the rte_kni module |
| 101 |
local emesonargs=( |
Archives