diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-08-19 09:24:39 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-20 15:30:07 +0100 |
commit | 57d5f4ad410d4e9d55bdd9734bf5ab8fa6667a53 (patch) | |
tree | 761859131581f83f01dab8e8bd0645ca16097a8c /meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | |
parent | c36fb625d1971aa784de70b8a135fd1787e891aa (diff) | |
download | poky-57d5f4ad410d4e9d55bdd9734bf5ab8fa6667a53.tar.gz |
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 <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 16 |
1 files changed, 14 insertions, 2 deletions
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" | |||
30 | # | 30 | # |
31 | # -- RP | 31 | # -- RP |
32 | 32 | ||
33 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 33 | LIC_FILES_CHKSUM ?= "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
34 | 34 | ||
35 | RECIPE_NO_UPDATE_REASON = "Recipe is updated through a separate process" | 35 | RECIPE_NO_UPDATE_REASON = "Recipe is updated through a separate process" |
36 | 36 | ||
@@ -46,6 +46,9 @@ python __anonymous () { | |||
46 | d.setVar("HEADER_FETCH_VER", "2.6") | 46 | d.setVar("HEADER_FETCH_VER", "2.6") |
47 | } | 47 | } |
48 | 48 | ||
49 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[0]}" | ||
50 | MIN_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[1]}" | ||
51 | |||
49 | inherit kernel-arch pkgconfig multilib_header | 52 | inherit kernel-arch pkgconfig multilib_header |
50 | 53 | ||
51 | KORG_ARCHIVE_COMPRESSION ?= "xz" | 54 | KORG_ARCHIVE_COMPRESSION ?= "xz" |
@@ -83,7 +86,16 @@ do_install_append_armeb () { | |||
83 | } | 86 | } |
84 | 87 | ||
85 | do_install_armmultilib () { | 88 | do_install_armmultilib () { |
86 | 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 | 89 | if [ ${MAJ_VER} -gt 5 ]; then |
90 | ARM_KVM_HEADER="" | ||
91 | else | ||
92 | if [ ${MAJ_VER} -eq 5 ] && [ ${MIN_VER} -ge 8 ]; then | ||
93 | ARM_KVM_HEADER="" | ||
94 | else | ||
95 | ARM_KVM_HEADER="asm/kvm.h" | ||
96 | fi | ||
97 | fi | ||
98 | 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 | ||
87 | 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 | 99 | 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 |
88 | } | 100 | } |
89 | 101 | ||