diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-07-02 00:53:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-12 16:50:45 +0100 |
commit | 9cc1290cd6dd87f8b5adcf804ae29ef63d9aca95 (patch) | |
tree | 81511f8060fa23f483355c01f80f5dd13cde886c /meta | |
parent | 1cef9f2e14bb189421ee17f0c168e8b9f6c400cb (diff) | |
download | poky-9cc1290cd6dd87f8b5adcf804ae29ef63d9aca95.tar.gz |
linux-libc-headers: bump to 6.4
kernel version 6.4 is the reference kernel for the fall
release.
This brings libc-headers up to date with that tested
reference
For musl, we drop one patch that has been merged upstream.
(From OE-Core rev: 8dce94b89396a99bb20a0a0ba9db0244d95db7e0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch | 42 | ||||
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.4.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.1.bb) | 3 |
3 files changed, 2 insertions, 45 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 0b33e61924..18daf446e5 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.40%" | 21 | BINUVERSION ?= "2.40%" |
22 | GDBVERSION ?= "13.%" | 22 | GDBVERSION ?= "13.%" |
23 | GLIBCVERSION ?= "2.37" | 23 | GLIBCVERSION ?= "2.37" |
24 | LINUXLIBCVERSION ?= "6.1%" | 24 | LINUXLIBCVERSION ?= "6.4%" |
25 | QEMUVERSION ?= "8.0%" | 25 | QEMUVERSION ?= "8.0%" |
26 | GOVERSION ?= "1.20%" | 26 | GOVERSION ?= "1.20%" |
27 | LLVMVERSION ?= "16.%" | 27 | LLVMVERSION ?= "16.%" |
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 deleted file mode 100644 index 5b7c1b6e21..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From dc221138c809125dc1bbff8506c70cb7bd846368 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 12 Sep 2018 17:08:58 -0700 | ||
4 | Subject: [PATCH] include linux/stddef.h in swab.h uapi header | ||
5 | |||
6 | swab.h uses __always_inline without including the header where it is | ||
7 | defined, this is exposed by musl based distributions where this macro is | ||
8 | not defined by system C library headers unlike glibc where it is defined | ||
9 | in sys/cdefs.h and that header gets pulled in indirectly via | ||
10 | |||
11 | features.h -> sys/cdefs.h | ||
12 | |||
13 | and features.h gets pulled in a lot of headers. Therefore it may work in | ||
14 | cases where features.h is includes but not otherwise. | ||
15 | |||
16 | Adding linux/stddef.h here ensures that __always_inline is always | ||
17 | defined independent of which C library is used in userspace | ||
18 | |||
19 | Upstream-Status: Submitted [https://lkml.org/lkml/2018/9/13/78] | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | Cc: Philippe Ombredanne <pombredanne@nexb.com> | ||
23 | Cc: Kate Stewart <kstewart@linuxfoundation.org> | ||
24 | Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
25 | Cc: Thomas Gleixner <tglx@linutronix.de> | ||
26 | |||
27 | --- | ||
28 | include/uapi/linux/swab.h | 1 + | ||
29 | 1 file changed, 1 insertion(+) | ||
30 | |||
31 | diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h | ||
32 | index 7272f85d6..2912fe463 100644 | ||
33 | --- a/include/uapi/linux/swab.h | ||
34 | +++ b/include/uapi/linux/swab.h | ||
35 | @@ -3,6 +3,7 @@ | ||
36 | #define _UAPI_LINUX_SWAB_H | ||
37 | |||
38 | #include <linux/types.h> | ||
39 | +#include <linux/stddef.h> | ||
40 | #include <linux/compiler.h> | ||
41 | #include <asm/bitsperlong.h> | ||
42 | #include <asm/swab.h> | ||
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.4.bb index cbdebdc1e8..c52315499e 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.1.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.4.bb | |||
@@ -4,7 +4,6 @@ SRC_URI:append:libc-musl = "\ | |||
4 | file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ | 4 | file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ |
5 | file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ | 5 | file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ |
6 | file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ | 6 | file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ |
7 | file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ | ||
8 | " | 7 | " |
9 | 8 | ||
10 | SRC_URI += "\ | 9 | SRC_URI += "\ |
@@ -13,6 +12,6 @@ SRC_URI += "\ | |||
13 | 12 | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
15 | 14 | ||
16 | SRC_URI[sha256sum] = "2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb" | 15 | SRC_URI[sha256sum] = "8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3" |
17 | 16 | ||
18 | 17 | ||