summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-08-19 09:24:39 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-20 15:30:07 +0100
commit57d5f4ad410d4e9d55bdd9734bf5ab8fa6667a53 (patch)
tree761859131581f83f01dab8e8bd0645ca16097a8c
parentc36fb625d1971aa784de70b8a135fd1787e891aa (diff)
downloadpoky-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>
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc16
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch10
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb)6
4 files changed, 23 insertions, 11 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index d5e0e9ebbb..4f29d00e99 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.35%" 21BINUVERSION ?= "2.35%"
22GDBVERSION ?= "9.%" 22GDBVERSION ?= "9.%"
23GLIBCVERSION ?= "2.32" 23GLIBCVERSION ?= "2.32"
24LINUXLIBCVERSION ?= "5.4%" 24LINUXLIBCVERSION ?= "5.8%"
25QEMUVERSION ?= "5.1%" 25QEMUVERSION ?= "5.1%"
26GOVERSION ?= "1.14%" 26GOVERSION ?= "1.14%"
27# This can not use wildcards like 8.0.% since it is also used in mesa to denote 27# This can not use wildcards like 8.0.% since it is also used in mesa to denote
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
33LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 33LIC_FILES_CHKSUM ?= "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
34 34
35RECIPE_NO_UPDATE_REASON = "Recipe is updated through a separate process" 35RECIPE_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
49MAJ_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[0]}"
50MIN_VER = "${@oe.utils.trim_version("${PV}", 2).split('.')[1]}"
51
49inherit kernel-arch pkgconfig multilib_header 52inherit kernel-arch pkgconfig multilib_header
50 53
51KORG_ARCHIVE_COMPRESSION ?= "xz" 54KORG_ARCHIVE_COMPRESSION ?= "xz"
@@ -83,7 +86,16 @@ do_install_append_armeb () {
83} 86}
84 87
85do_install_armmultilib () { 88do_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
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
index 9d17daa70f..5b7c1b6e21 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
@@ -1,4 +1,4 @@
1From 9708dc74d9f49488d669e070982f6224a888d61a Mon Sep 17 00:00:00 2001 1From dc221138c809125dc1bbff8506c70cb7bd846368 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Sep 2018 17:08:58 -0700 3Date: Wed, 12 Sep 2018 17:08:58 -0700
4Subject: [PATCH] include linux/stddef.h in swab.h uapi header 4Subject: [PATCH] include linux/stddef.h in swab.h uapi header
@@ -23,12 +23,13 @@ Cc: Philippe Ombredanne <pombredanne@nexb.com>
23Cc: Kate Stewart <kstewart@linuxfoundation.org> 23Cc: Kate Stewart <kstewart@linuxfoundation.org>
24Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 24Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
25Cc: Thomas Gleixner <tglx@linutronix.de> 25Cc: Thomas Gleixner <tglx@linutronix.de>
26
26--- 27---
27 include/uapi/linux/swab.h | 1 + 28 include/uapi/linux/swab.h | 1 +
28 1 file changed, 1 insertion(+) 29 1 file changed, 1 insertion(+)
29 30
30diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h 31diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
31index 23cd84868cc3..acddbe50a20d 100644 32index 7272f85d6..2912fe463 100644
32--- a/include/uapi/linux/swab.h 33--- a/include/uapi/linux/swab.h
33+++ b/include/uapi/linux/swab.h 34+++ b/include/uapi/linux/swab.h
34@@ -3,6 +3,7 @@ 35@@ -3,6 +3,7 @@
@@ -37,8 +38,5 @@ index 23cd84868cc3..acddbe50a20d 100644
37 #include <linux/types.h> 38 #include <linux/types.h>
38+#include <linux/stddef.h> 39+#include <linux/stddef.h>
39 #include <linux/compiler.h> 40 #include <linux/compiler.h>
41 #include <asm/bitsperlong.h>
40 #include <asm/swab.h> 42 #include <asm/swab.h>
41
42--
432.19.0
44
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb
index 8a12103ee5..d76a8a36f8 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb
@@ -12,5 +12,7 @@ SRC_URI_append = "\
12 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ 12 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
13" 13"
14 14
15SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9" 15LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
16SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491" 16
17SRC_URI[md5sum] = "0e5c4c15266218ef26c50fac0016095b"
18SRC_URI[sha256sum] = "e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5"