summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-07-02 11:13:44 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-05 10:59:40 +0100
commitecd989378be1449fa7c046ee1f93abd3def624b9 (patch)
treecdd36867511120e1a27a2b927eed8c08406e7f69 /meta
parent66d657c138ef27b539a1abdb127794429b6e2dab (diff)
downloadpoky-ecd989378be1449fa7c046ee1f93abd3def624b9.tar.gz
linux-libc-headers: update to 5.13
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. (From OE-Core rev: 3a171279d8ebe6efc714842c762521354aecebec) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch12
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb)5
3 files changed, 9 insertions, 10 deletions
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}"
21BINUVERSION ?= "2.36%" 21BINUVERSION ?= "2.36%"
22GDBVERSION ?= "10.%" 22GDBVERSION ?= "10.%"
23GLIBCVERSION ?= "2.33" 23GLIBCVERSION ?= "2.33"
24LINUXLIBCVERSION ?= "5.10%" 24LINUXLIBCVERSION ?= "5.13%"
25QEMUVERSION ?= "6.0%" 25QEMUVERSION ?= "6.0%"
26GOVERSION ?= "1.16%" 26GOVERSION ?= "1.16%"
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/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
13 include/uapi/linux/kernel.h | 2 ++ 13 include/uapi/linux/kernel.h | 2 ++
14 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
15 15
16Index: linux-4.8-rc4/include/uapi/linux/kernel.h 16Index: linux-5.12.11/include/uapi/linux/kernel.h
17=================================================================== 17===================================================================
18--- linux-4.8-rc4.orig/include/uapi/linux/kernel.h 18--- linux-5.12.11.orig/include/uapi/linux/kernel.h
19+++ linux-4.8-rc4/include/uapi/linux/kernel.h 19+++ linux-5.12.11/include/uapi/linux/kernel.h
20@@ -1,7 +1,9 @@ 20@@ -2,7 +2,9 @@
21 #ifndef _UAPI_LINUX_KERNEL_H 21 #ifndef _UAPI_LINUX_KERNEL_H
22 #define _UAPI_LINUX_KERNEL_H 22 #define _UAPI_LINUX_KERNEL_H
23 23
24+#ifdef __GLIBC__ 24+#ifdef __GLIBC__
25 #include <linux/sysinfo.h> 25 #include <linux/sysinfo.h>
26 #include <linux/const.h>
26+#endif 27+#endif
27 28
28 /* 29 #endif /* _UAPI_LINUX_KERNEL_H */
29 * 'kernel.h' contains some often-used function prototypes etc
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
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 = "\
14 14
15LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 15LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
16 16
17SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3" 17SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4"
18SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43" 18SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9"
19