From 2179569945f07a8ad54b9015dc5fad4300cdbde9 Mon Sep 17 00:00:00 2001 From: "INC@Cisco)" Date: Fri, 26 Mar 2021 03:45:47 -0700 Subject: bpftool: remove recipe from blacklist Have not seen build issues for 5.4 and 5.10 x86-64 kernels so allow to build it Signed-off-by: Denys Zagorui Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 4 ++-- meta-oe/recipes-kernel/bpftool/bpftool.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 42087ce4e0..b0ad1bf81b 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -624,12 +624,12 @@ RDEPENDS_packagegroup-meta-oe-kernel ="\ trace-cmd \ " RDEPENDS_packagegroup-meta-oe-kernel_append_x86 = " intel-speed-select ipmiutil pm-graph turbostat" -RDEPENDS_packagegroup-meta-oe-kernel_append_x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat" +RDEPENDS_packagegroup-meta-oe-kernel_append_x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat bpftool" RDEPENDS_packagegroup-meta-oe-kernel_append_poerpc64 = " libpfm4" # Kernel-selftest does not build with 5.8 and its exluded from build too so until its fixed remove it RDEPENDS_packagegroup-meta-oe-kernel_remove = "kernel-selftest" -RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash intel-speed-select kernel-selftest minicoredumper turbostat" +RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "bpftool crash intel-speed-select kernel-selftest minicoredumper turbostat" RDEPENDS_packagegroup-meta-oe-kernel_remove_mipsarch = "makedumpfile" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb index 1758430bc8..15143a90b2 100644 --- a/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -15,6 +15,7 @@ SECURITY_CFLAGS = "" do_configure[depends] += "virtual/kernel:do_shared_workdir" +COMPATIBLE_HOST = "(x86_64).*-linux" COMPATIBLE_HOST_libc-musl = 'null' do_compile() { @@ -32,4 +33,3 @@ python do_package_prepend() { } B = "${WORKDIR}/${BPN}-${PV}" -PNBLACKLIST[bpftool] ?= "Needs forward porting to kernel 5.2+" -- cgit 1.2.3-korg