From 57d5f4ad410d4e9d55bdd9734bf5ab8fa6667a53 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 19 Aug 2020 09:24:39 -0400 Subject: libc-headers: update to v5.8 Updating the libc-headers to v5.8. Adjustments to the recipe include: The license checksum. Needs to be updated to account for kernel commit 74835c7db0322b [COPYING: state that all contributions really are covered by this file]. And the ARM multilib headers need to check the version to adjust for kernel commit: 541ad0150ca4 [arm: Remove 32bit KVM host support]. We don't want to break potential other libc-header users, so we check the version and continue to install the file if the version is less than v5.8 One patch is refreshed to remove fuzz when building musl. (From OE-Core rev: 4c3750bbc9dae30d91bd0e5efc8f614810289b31) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- .../linux-libc-headers/linux-libc-headers.inc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc') diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 20139a8497..b1cb553c75 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -30,7 +30,7 @@ LICENSE = "GPLv2" # # -- RP -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LIC_FILES_CHKSUM ?= "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" RECIPE_NO_UPDATE_REASON = "Recipe is updated through a separate process" @@ -46,6 +46,9 @@ python __anonymous () { d.setVar("HEADER_FETCH_VER", "2.6") } +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[0]}" +MIN_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[1]}" + inherit kernel-arch pkgconfig multilib_header KORG_ARCHIVE_COMPRESSION ?= "xz" @@ -83,7 +86,16 @@ do_install_append_armeb () { } do_install_armmultilib () { - oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h + if [ ${MAJ_VER} -gt 5 ]; then + ARM_KVM_HEADER="" + else + if [ ${MAJ_VER} -eq 5 ] && [ ${MIN_VER} -ge 8 ]; then + ARM_KVM_HEADER="" + else + ARM_KVM_HEADER="asm/kvm.h" + fi + fi + oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h $ARM_KVM_HEADER asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h } -- cgit v1.2.3-54-g00ecf