diff options
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 | ||||
-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}" | |||
21 | BINUVERSION ?= "2.36%" | 21 | BINUVERSION ?= "2.36%" |
22 | GDBVERSION ?= "10.%" | 22 | GDBVERSION ?= "10.%" |
23 | GLIBCVERSION ?= "2.33" | 23 | GLIBCVERSION ?= "2.33" |
24 | LINUXLIBCVERSION ?= "5.10%" | 24 | LINUXLIBCVERSION ?= "5.13%" |
25 | QEMUVERSION ?= "6.0%" | 25 | QEMUVERSION ?= "6.0%" |
26 | GOVERSION ?= "1.16%" | 26 | GOVERSION ?= "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 | ||
16 | Index: linux-4.8-rc4/include/uapi/linux/kernel.h | 16 | Index: 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 | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
16 | 16 | ||
17 | SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3" | 17 | SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4" |
18 | SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43" | 18 | SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9" |
19 | |||