From c5f7cfb8db54cfa4257797db5bd87828dea43296 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 31 Jul 2021 18:22:04 -0700 Subject: libhugetlbfs: Disable build with glibc 2.34+ It uses __morecore internal function from glibc which has been removed in 2.34+ and replacing it is not so simple and upstream needs to fix it see [1] [1] https://github.com/libhugetlbfs/libhugetlbfs/issues/52 Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 3 +++ meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 1 - meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index aa9eb02b34..124b142d83 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -74,3 +74,6 @@ INSANE_SKIP_${PN} = "dev-so" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# see https://github.com/libhugetlbfs/libhugetlbfs/issues/52 +PNBLACKLIST[libhugetlbfs] ?= "Needs porting to glibc 2.34+" diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index a95fe8b040..84f89f4e71 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -68,7 +68,6 @@ RDEPENDS_packagegroup-meta-oe-benchmarks = "\ iperf2 \ iperf3 \ libc-bench \ - libhugetlbfs \ linpack \ lmbench \ mbw \ diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 4caf217c24..11cf935c73 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -18,7 +18,7 @@ SRC_URI += "file://run-ptest \ # we will append other kernel selftest in the future # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG -PACKAGECONFIG ??= "firmware vm" +PACKAGECONFIG ??= "firmware" PACKAGECONFIG_remove_x86 = "bpf" PACKAGECONFIG_remove_arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed @@ -137,4 +137,3 @@ COMPATIBLE_HOST_libc-musl = 'null' # It has native clang/llvm dependency, poky distro is reluctant to include them as deps # this helps with world builds on AB EXCLUDE_FROM_WORLD = "1" - -- cgit 1.2.3-korg