Re: [OE-core] [PATCH 4/8] linux-libc-headers: update to 5.13
From: Khem Raj <hidden>
Date: 2021-07-06 17:43:20
Hi Bruce On Fri, Jul 2, 2021 at 8:14 AM Bruce Ashfield [off-list ref] wrote:
From: Bruce Ashfield <redacted> Bumping the libc-headers to match the latest OE core reference kernel. We refresh one of the musl patches to udpate to the 5.12+ context of the header, but otherwise everything is unchanged.
This is primarily going ok, I see one failure however with keepalived here https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1388
quoted hunk ↗ jump to hunk
Signed-off-by: Bruce Ashfield <redacted> --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...3-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 ++++++------ ...bc-headers_5.10.bb => linux-libc-headers_5.13.bb} | 5 ++--- 3 files changed, 9 insertions(+), 10 deletions(-) rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.10.bb => linux-libc-headers_5.13.bb} (80%)diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index c6e5ac61d7..68e5d848ba 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.36%" GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.33" -LINUXLIBCVERSION ?= "5.10%" +LINUXLIBCVERSION ?= "5.13%" QEMUVERSION ?= "6.0%" GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denotediff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch index b5c4e1750e..b0e7014138 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch@@ -13,17 +13,17 @@ Upstream-Status: Submitted include/uapi/linux/kernel.h | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-4.8-rc4/include/uapi/linux/kernel.h +Index: linux-5.12.11/include/uapi/linux/kernel.h =================================================================== ---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h -+++ linux-4.8-rc4/include/uapi/linux/kernel.h -@@ -1,7 +1,9 @@ +--- linux-5.12.11.orig/include/uapi/linux/kernel.h ++++ linux-5.12.11/include/uapi/linux/kernel.h +@@ -2,7 +2,9 @@ #ifndef _UAPI_LINUX_KERNEL_H #define _UAPI_LINUX_KERNEL_H +#ifdef __GLIBC__ #include <linux/sysinfo.h> + #include <linux/const.h> +#endif - /* - * 'kernel.h' contains some often-used function prototypes etc + #endif /* _UAPI_LINUX_KERNEL_H */diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb similarity index 80% rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb index d6a4d5aa61..251d00440d 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb@@ -14,6 +14,5 @@ SRC_URI_append = "\ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3" -SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43" - +SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4" +SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9" --2.19.1