summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb9
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch54
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch2
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb9
-rw-r--r--meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb3
-rw-r--r--meta/recipes-kernel/kmod/kmod_32.bb (renamed from meta/recipes-kernel/kmod/kmod_31.bb)7
-rw-r--r--meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch49
-rw-r--r--meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb (renamed from meta/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb)4
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_20240513.bb (renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20240220.bb)44
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.6.bb)2
-rw-r--r--meta/recipes-kernel/linux/cve-exclusion_6.6.inc1312
-rw-r--r--meta/recipes-kernel/linux/linux-dummy.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-dev.bb9
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.6.bb32
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb (renamed from meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb)2
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch70
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch142
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch79
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch100
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch58
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch46
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch79
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch124
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch88
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch52
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.11.bb)12
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch56
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch9
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.13.11.bb)5
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb)2
-rw-r--r--meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb3
-rw-r--r--meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb6
-rw-r--r--meta/recipes-kernel/perf/perf.bb13
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch40
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch40
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch51
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch32
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch52
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch23
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch36
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc11
-rw-r--r--meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.05.08.bb (renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.01.23.bb)2
44 files changed, 1973 insertions, 812 deletions
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
index 974fcba876..a766b00bef 100644
--- a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
+++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
@@ -7,11 +7,14 @@ SRC_URI = "file://dt-doc-validate \
7 file://dt-mk-schema \ 7 file://dt-mk-schema \
8 file://dt-validate" 8 file://dt-validate"
9 9
10S = "${WORKDIR}/sources"
11UNPACKDIR = "${S}"
12
10do_install() { 13do_install() {
11 install -d ${D}${bindir}/ 14 install -d ${D}${bindir}/
12 install -m 755 ${WORKDIR}/dt-doc-validate ${D}${bindir}/ 15 install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/
13 install -m 755 ${WORKDIR}/dt-mk-schema ${D}${bindir}/ 16 install -m 755 ${UNPACKDIR}/dt-mk-schema ${D}${bindir}/
14 install -m 755 ${WORKDIR}/dt-validate ${D}${bindir}/ 17 install -m 755 ${UNPACKDIR}/dt-validate ${D}${bindir}/
15} 18}
16 19
17BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch
new file mode 100644
index 0000000000..e223f45998
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch
@@ -0,0 +1,54 @@
1From 32c8ffa7ace6f1b7e63f9ddffab00b00c36a7b57 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 May 2024 21:18:08 -0700
4Subject: [PATCH] x86-linux-setup.c: Use POSIX basename API
5
6Musl C library only supports POSIX basename function. while glibc has
7both GNU extention as well as POSIX basename implemented. Switch to
8using posix version, so it can work across musl and glibc
9
10basename prototype has been removed from string.h from latest musl [1]
11compilers e.g. clang-18/GCC-14 flags the absense of prototype as error.
12therefore include libgen.h for providing it.
13
14[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
15
16Upstream-Status: Submitted [https://lists.infradead.org/pipermail/kexec/2024-May/030034.html]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 kexec/arch/i386/x86-linux-setup.c | 9 ++++++---
20 1 file changed, 6 insertions(+), 3 deletions(-)
21
22diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
23index 9a281dc..73251b9 100644
24--- a/kexec/arch/i386/x86-linux-setup.c
25+++ b/kexec/arch/i386/x86-linux-setup.c
26@@ -14,6 +14,7 @@
27 *
28 */
29 #define _GNU_SOURCE
30+#include <libgen.h>
31 #include <stdint.h>
32 #include <stdio.h>
33 #include <string.h>
34@@ -329,12 +330,14 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode,
35 memset(edd_info, 0, sizeof(struct edd_info));
36
37 /* extract the device number */
38- if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) {
39+ char* sysfs_name_copy = strdup(sysfs_name);
40+ if (sscanf(basename(sysfs_name_copy), "int13_dev%hhx", &devnum) != 1) {
41 fprintf(stderr, "Invalid format of int13_dev dir "
42- "entry: %s\n", basename(sysfs_name));
43+ "entry: %s\n", basename(sysfs_name_copy));
44+ free(sysfs_name_copy);
45 return -1;
46 }
47-
48+ free(sysfs_name_copy);
49 /* if there's a MBR signature, then add it */
50 if (file_scanf(sysfs_name, "mbr_signature", "0x%x", &mbr_sig) == 1) {
51 real_mode->edd_mbr_sig_buffer[*current_mbr] = mbr_sig;
52--
532.45.1
54
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
index e874a8b4f1..489b109285 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
@@ -8,7 +8,7 @@ is used by MMU, the "SECTION_SIZE" is defined with
8(1 << 21), but 'add_buffer_phys_virt()' hardcode this 8(1 << 21), but 'add_buffer_phys_virt()' hardcode this
9to (1 << 20). 9to (1 << 20).
10 10
11Upstream-Status: Pending 11Upstream-Status: Submitted [via email to horms@kernel.org,http://lists.infradead.org/pipermail/kexec/2024-April/029903.html]
12 12
13Suggested-By:fredrik.markstrom@gmail.com 13Suggested-By:fredrik.markstrom@gmail.com
14Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> 14Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
index dec821ea88..b60c51df4a 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
@@ -18,6 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
18 file://0005-Disable-PIE-during-link.patch \ 18 file://0005-Disable-PIE-during-link.patch \
19 file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ 19 file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
20 file://Fix-building-on-x86_64-with-binutils-2.41.patch \ 20 file://Fix-building-on-x86_64-with-binutils-2.41.patch \
21 file://0001-x86-linux-setup.c-Use-POSIX-basename-API.patch \
21 " 22 "
22 23
23SRC_URI[sha256sum] = "f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29" 24SRC_URI[sha256sum] = "f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29"
@@ -44,15 +45,15 @@ do_compile:prepend() {
44 45
45do_install:append () { 46do_install:append () {
46 install -d ${D}${sysconfdir}/sysconfig 47 install -d ${D}${sysconfdir}/sysconfig
47 install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig 48 install -m 0644 ${UNPACKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
48 49
49 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 50 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
50 install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump 51 install -D -m 0755 ${UNPACKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
51 fi 52 fi
52 53
53 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 54 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
54 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper 55 install -D -m 0755 ${UNPACKDIR}/kdump ${D}${libexecdir}/kdump-helper
55 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service 56 install -D -m 0644 ${UNPACKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service
56 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service 57 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service
57 fi 58 fi
58} 59}
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
index 6c0739d64f..29f34d7f36 100644
--- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
+++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
@@ -1,7 +1,8 @@
1SUMMARY = "Wrapper script for the Linux kernel module dependency indexer" 1SUMMARY = "Wrapper script for the Linux kernel module dependency indexer"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4S = "${WORKDIR}" 4S = "${WORKDIR}/sources"
5UNPACKDIR = "${S}"
5 6
6INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
7# The kernel and the staging dir for it is machine specific 8# The kernel and the staging dir for it is machine specific
diff --git a/meta/recipes-kernel/kmod/kmod_31.bb b/meta/recipes-kernel/kmod/kmod_32.bb
index 6ae83a7c66..1c4e5a94db 100644
--- a/meta/recipes-kernel/kmod/kmod_31.bb
+++ b/meta/recipes-kernel/kmod/kmod_32.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
15 " 15 "
16inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives 16inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives
17 17
18SRCREV = "aff617ea871d0568cc491bd116c0be1e857463bb" 18SRCREV = "41faa59711742c1476d59985011ee0f27ed91d30"
19 19
20SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \ 20SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \
21 file://depmod-search.conf \ 21 file://depmod-search.conf \
@@ -52,8 +52,9 @@ do_install:append () {
52 install -dm755 ${D}${base_bindir} 52 install -dm755 ${D}${base_bindir}
53 install -dm755 ${D}${base_sbindir} 53 install -dm755 ${D}${base_sbindir}
54 # add symlinks to kmod 54 # add symlinks to kmod
55 ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod 55 [ -e ${D}${base_bindir}/lsmod ] || ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod
56 for tool in insmod rmmod depmod modinfo modprobe; do 56 for tool in insmod rmmod depmod modinfo modprobe; do
57 rm -f ${D}${base_bindir}/${tool}
57 ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} 58 ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool}
58 done 59 done
59 # configuration directories 60 # configuration directories
@@ -63,7 +64,7 @@ do_install:append () {
63 install -dm755 ${D}${sysconfdir}/modprobe.d 64 install -dm755 ${D}${sysconfdir}/modprobe.d
64 65
65 # install depmod.d file for search/ dir 66 # install depmod.d file for search/ dir
66 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" 67 install -Dm644 "${UNPACKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf"
67 68
68 # Add .debug to the exclude path for depmod 69 # Add .debug to the exclude path for depmod
69 echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf 70 echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
index 38b6107136..c723c236c0 100644
--- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
+++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
@@ -1,14 +1,20 @@
1Fixes for the Meson build of libtraceevent: 1From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Sun, 27 Aug 2023 20:57:44 +0100
4Subject: [PATCH] Fixes for the Meson build of libtraceevent:
2 5
3- Make the plugin directory the same as the Makefiles 6- Make the plugin directory the same as the Makefiles
4- Install the plugins as modules not static and versioned shared libraries 7- Install the plugins as modules not static and versioned shared libraries
5- Add an option to disable building the documentation (needs asciidoc and xmlto)
6 8
7Upstream-Status: Pending 9Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de/T/#u]
8Signed-off-by: Ross Burton <ross.burton@arm.com> 10Signed-off-by: Ross Burton <ross.burton@arm.com>
11---
12 meson.build | 2 +-
13 plugins/meson.build | 3 +--
14 2 files changed, 2 insertions(+), 3 deletions(-)
9 15
10diff --git a/meson.build b/meson.build 16diff --git a/meson.build b/meson.build
11index b61c873..4bba4d8 100644 17index 40ce38c..1eb7912 100644
12--- a/meson.build 18--- a/meson.build
13+++ b/meson.build 19+++ b/meson.build
14@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) 20@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir'))
@@ -20,41 +26,6 @@ index b61c873..4bba4d8 100644
20 endif 26 endif
21 27
22 add_project_arguments( 28 add_project_arguments(
23@@ -45,10 +45,13 @@ if cunit_dep.found()
24 subdir('utest')
25 endif
26 subdir('samples')
27-subdir('Documentation')
28
29-custom_target(
30- 'docs',
31- output: 'docs',
32- depends: [html, man],
33- command: ['echo'])
34+if get_option('docs')
35+ subdir('Documentation')
36+
37+ custom_target(
38+ 'docs',
39+ output: 'docs',
40+ depends: [html, man],
41+ command: ['echo'])
42+endif
43diff --git a/meson_options.txt b/meson_options.txt
44index b2294f6..0611216 100644
45--- a/meson_options.txt
46+++ b/meson_options.txt
47@@ -4,6 +4,10 @@
48
49 option('plugindir', type : 'string',
50 description : 'set the plugin dir')
51+
52+option('docs', type : 'boolean', value: true,
53+ description : 'build documentation')
54+
55 option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc',
56 description : 'directory for HTML documentation')
57 option('asciidoctor', type : 'boolean', value: false,
58diff --git a/plugins/meson.build b/plugins/meson.build 29diff --git a/plugins/meson.build b/plugins/meson.build
59index 74ad664..4919be4 100644 30index 74ad664..4919be4 100644
60--- a/plugins/meson.build 31--- a/plugins/meson.build
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb
index bee7891832..d4ace54884 100644
--- a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
+++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97
8 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" 8 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
9SECTION = "libs" 9SECTION = "libs"
10 10
11SRCREV = "dd148189b74da3e2f45c7e536319fec97cb71213" 11SRCREV = "6f6d5802f31992e7527a4c32b43a32fda6bf6bdf"
12SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ 12SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
13 file://meson.patch" 13 file://meson.patch"
14 14
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
16 16
17inherit meson pkgconfig 17inherit meson pkgconfig
18 18
19EXTRA_OEMESON = "-Ddocs=false" 19EXTRA_OEMESON = "-Ddoc=false"
20 20
21PACKAGES += "${PN}-plugins" 21PACKAGES += "${PN}-plugins"
22 22
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240220.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240513.bb
index b35802d1dc..4a87105d98 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240220.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240513.bb
@@ -39,6 +39,7 @@ LICENSE = "\
39 & Firmware-kaweth \ 39 & Firmware-kaweth \
40 & Firmware-linaro \ 40 & Firmware-linaro \
41 & Firmware-Lontium \ 41 & Firmware-Lontium \
42 & Firmware-mali_csffw \
42 & Firmware-Marvell \ 43 & Firmware-Marvell \
43 & Firmware-mediatek \ 44 & Firmware-mediatek \
44 & Firmware-microchip \ 45 & Firmware-microchip \
@@ -82,7 +83,7 @@ LICENSE = "\
82LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ 83LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
83 file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ 84 file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
84 file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ 85 file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
85 file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \ 86 file://LICENSE.amdgpu;md5=1433dfea38c97a2e563a248a863dcb94 \
86 file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ 87 file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \
87 file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ 88 file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \
88 file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \ 89 file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \
@@ -113,6 +114,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
113 file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ 114 file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \
114 file://LICENCE.linaro;md5=936d91e71cf9cd30e733db4bf11661cc \ 115 file://LICENCE.linaro;md5=936d91e71cf9cd30e733db4bf11661cc \
115 file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \ 116 file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \
117 file://LICENCE.mali_csffw;md5=e064aaec4d21ef856e1b76a6f5dc435f \
116 file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ 118 file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \
117 file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ 119 file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \
118 file://LICENCE.microchip;md5=db753b00305675dfbf120e3f24a47277 \ 120 file://LICENCE.microchip;md5=db753b00305675dfbf120e3f24a47277 \
@@ -154,7 +156,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
154 " 156 "
155# WHENCE checksum is defined separately to ease overriding it if 157# WHENCE checksum is defined separately to ease overriding it if
156# class-devupstream is selected. 158# class-devupstream is selected.
157WHENCE_CHKSUM = "a344e6c28970fc7daafa81c10247aeb6" 159WHENCE_CHKSUM = "ae024b46fd393d199f66bbe1f3ff5254"
158 160
159# These are not common licenses, set NO_GENERIC_LICENSE for them 161# These are not common licenses, set NO_GENERIC_LICENSE for them
160# so that the license files will be copied from fetched source 162# so that the license files will be copied from fetched source
@@ -192,6 +194,7 @@ NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware"
192NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" 194NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth"
193NO_GENERIC_LICENSE[Firmware-linaro] = "LICENCE.linaro" 195NO_GENERIC_LICENSE[Firmware-linaro] = "LICENCE.linaro"
194NO_GENERIC_LICENSE[Firmware-Lontium] = "LICENSE.Lontium" 196NO_GENERIC_LICENSE[Firmware-Lontium] = "LICENSE.Lontium"
197NO_GENERIC_LICENSE[Firmware-mali_csffw] = "LICENCE.mali_csffw"
195NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" 198NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell"
196NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek" 199NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek"
197NO_GENERIC_LICENSE[Firmware-microchip] = "LICENCE.microchip" 200NO_GENERIC_LICENSE[Firmware-microchip] = "LICENCE.microchip"
@@ -241,7 +244,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
241# Pin this to the 20220509 release, override this in local.conf 244# Pin this to the 20220509 release, override this in local.conf
242SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" 245SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
243 246
244SRC_URI[sha256sum] = "bf0f239dc0801e9d6bf5d5fb3e2f549575632cf4688f4348184199cb02c2bcd7" 247SRC_URI[sha256sum] = "9f05edb99668135d37cedc4fdd18aac2802dc9e4566e086e6c6c2e321f3ecc4e"
245 248
246inherit allarch 249inherit allarch
247 250
@@ -322,7 +325,8 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
322 ${PN}-cnm-license ${PN}-cnm \ 325 ${PN}-cnm-license ${PN}-cnm \
323 ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ 326 ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \
324 ${PN}-carl9170 \ 327 ${PN}-carl9170 \
325 ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ 328 ${PN}-qcom-qrb4210-wifi ${PN}-qcom-sdm845-modem \
329 ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-ath12k ${PN}-qca \
326 \ 330 \
327 ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ 331 ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \
328 \ 332 \
@@ -343,6 +347,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
343 ${PN}-ibt-license ${PN}-ibt \ 347 ${PN}-ibt-license ${PN}-ibt \
344 ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ 348 ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \
345 ${PN}-ibt-17 \ 349 ${PN}-ibt-17 \
350 ${PN}-ibt-18 \
346 ${PN}-ibt-20 \ 351 ${PN}-ibt-20 \
347 ${PN}-ibt-misc \ 352 ${PN}-ibt-misc \
348 ${PN}-i915-license ${PN}-i915 \ 353 ${PN}-i915-license ${PN}-i915 \
@@ -352,6 +357,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
352 ${PN}-bnx2 \ 357 ${PN}-bnx2 \
353 ${PN}-bnx2x \ 358 ${PN}-bnx2x \
354 ${PN}-liquidio \ 359 ${PN}-liquidio \
360 ${PN}-mali-csffw-arch108 ${PN}-mali-csffw-license \
355 ${PN}-mellanox \ 361 ${PN}-mellanox \
356 ${PN}-nvidia-license \ 362 ${PN}-nvidia-license \
357 ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ 363 ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \
@@ -383,13 +389,13 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
383 ${PN}-qcom-apq8096-adreno ${PN}-qcom-apq8096-audio ${PN}-qcom-apq8096-modem \ 389 ${PN}-qcom-apq8096-adreno ${PN}-qcom-apq8096-audio ${PN}-qcom-apq8096-modem \
384 ${PN}-qcom-qcm2290-adreno ${PN}-qcom-qcm2290-audio ${PN}-qcom-qcm2290-modem ${PN}-qcom-qcm2290-wifi \ 390 ${PN}-qcom-qcm2290-adreno ${PN}-qcom-qcm2290-audio ${PN}-qcom-qcm2290-modem ${PN}-qcom-qcm2290-wifi \
385 ${PN}-qcom-qrb4210-adreno ${PN}-qcom-qrb4210-audio ${PN}-qcom-qrb4210-compute \ 391 ${PN}-qcom-qrb4210-adreno ${PN}-qcom-qrb4210-audio ${PN}-qcom-qrb4210-compute \
386 ${PN}-qcom-qrb4210-modem ${PN}-qcom-qrb4210-wifi \ 392 ${PN}-qcom-qrb4210-modem \
387 ${PN}-qcom-sc8280xp-lenovo-x13s-compat \ 393 ${PN}-qcom-sc8280xp-lenovo-x13s-compat \
388 ${PN}-qcom-sc8280xp-lenovo-x13s-audio \ 394 ${PN}-qcom-sc8280xp-lenovo-x13s-audio \
389 ${PN}-qcom-sc8280xp-lenovo-x13s-adreno \ 395 ${PN}-qcom-sc8280xp-lenovo-x13s-adreno \
390 ${PN}-qcom-sc8280xp-lenovo-x13s-compute \ 396 ${PN}-qcom-sc8280xp-lenovo-x13s-compute \
391 ${PN}-qcom-sc8280xp-lenovo-x13s-sensors \ 397 ${PN}-qcom-sc8280xp-lenovo-x13s-sensors \
392 ${PN}-qcom-sdm845-adreno ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ 398 ${PN}-qcom-sdm845-adreno ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute \
393 ${PN}-qcom-sdm845-thundercomm-db845c-sensors \ 399 ${PN}-qcom-sdm845-thundercomm-db845c-sensors \
394 ${PN}-qcom-sm8250-adreno ${PN}-qcom-sm8250-audio ${PN}-qcom-sm8250-compute \ 400 ${PN}-qcom-sm8250-adreno ${PN}-qcom-sm8250-audio ${PN}-qcom-sm8250-compute \
395 ${PN}-qcom-sm8250-thundercomm-rb5-sensors \ 401 ${PN}-qcom-sm8250-thundercomm-rb5-sensors \
@@ -487,6 +493,10 @@ FILES:${PN}-ath11k = " \
487 ${nonarch_base_libdir}/firmware/ath11k \ 493 ${nonarch_base_libdir}/firmware/ath11k \
488" 494"
489 495
496FILES:${PN}-ath12k = " \
497 ${nonarch_base_libdir}/firmware/ath12k \
498"
499
490FILES:${PN}-qca = " \ 500FILES:${PN}-qca = " \
491 ${nonarch_base_libdir}/firmware/qca \ 501 ${nonarch_base_libdir}/firmware/qca \
492" 502"
@@ -494,6 +504,7 @@ FILES:${PN}-qca = " \
494RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" 504RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license"
495RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" 505RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license"
496RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" 506RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license"
507RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license"
497RDEPENDS:${PN}-qca += "${PN}-ath10k-license" 508RDEPENDS:${PN}-qca += "${PN}-ath10k-license"
498 509
499# For ralink 510# For ralink
@@ -601,6 +612,13 @@ LICENSE:${PN}-lt9611uxc = "Firmware-Lontium"
601FILES:${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium" 612FILES:${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium"
602FILES:${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin" 613FILES:${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin"
603 614
615# For Arm Mali
616LICENSE:${PN}-mali-csffw-arch108 = "Firmware-mali_csffw"
617FILES:${PN}-mali-csffw-license = "${nonarch_base_libdir}/firmware/LICENCE.mali_csffw"
618FILES:${PN}-mali-csffw-arch108 = "${nonarch_base_libdir}/firmware/arm/mali/arch10.8/mali_csffw.bin"
619
620RDEPENDS:${PN}-mali-csffw-arch108 += "${PN}-mali-csffw-license"
621
604# For marvell 622# For marvell
605LICENSE:${PN}-pcie8897 = "Firmware-Marvell" 623LICENSE:${PN}-pcie8897 = "Firmware-Marvell"
606LICENSE:${PN}-pcie8997 = "Firmware-Marvell" 624LICENSE:${PN}-pcie8997 = "Firmware-Marvell"
@@ -1272,6 +1290,7 @@ LICENSE:${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware"
1272LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware" 1290LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware"
1273LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware" 1291LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware"
1274LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware" 1292LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware"
1293LICENSE:${PN}-ibt-18 = "Firmware-ibt_firmware"
1275LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware" 1294LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware"
1276LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware" 1295LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware"
1277 1296
@@ -1281,6 +1300,7 @@ FILES:${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bs
1281FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" 1300FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc"
1282FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" 1301FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc"
1283FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" 1302FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc"
1303FILES:${PN}-ibt-18 = "${nonarch_base_libdir}/firmware/intel/ibt-18-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-18-*.ddc"
1284FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" 1304FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc"
1285FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" 1305FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*"
1286 1306
@@ -1289,6 +1309,7 @@ RDEPENDS:${PN}-ibt-hw-37.8 = "${PN}-ibt-license"
1289RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license" 1309RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license"
1290RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license" 1310RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license"
1291RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license" 1311RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license"
1312RDEPENDS:${PN}-ibt-18 = "${PN}-ibt-license"
1292RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license" 1313RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license"
1293RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license" 1314RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license"
1294 1315
@@ -1410,12 +1431,12 @@ FILES:${PN}-qcom-apq8096-modem = "${nonarch_base_libdir}/firmware/qcom/apq8096/m
1410FILES:${PN}-qcom-qcm2290-adreno = "${nonarch_base_libdir}/firmware/qcom/qcm2290/a702_zap.mbn" 1431FILES:${PN}-qcom-qcm2290-adreno = "${nonarch_base_libdir}/firmware/qcom/qcm2290/a702_zap.mbn"
1411FILES:${PN}-qcom-qcm2290-audio = "${nonarch_base_libdir}/firmware/qcom/qcm2290/adsp*.*" 1432FILES:${PN}-qcom-qcm2290-audio = "${nonarch_base_libdir}/firmware/qcom/qcm2290/adsp*.*"
1412FILES:${PN}-qcom-qcm2290-modem = "${nonarch_base_libdir}/firmware/qcom/qcm2290/modem*.*" 1433FILES:${PN}-qcom-qcm2290-modem = "${nonarch_base_libdir}/firmware/qcom/qcm2290/modem*.*"
1413FILES:${PN}-qcom-qcm2290-wifi = "${nonarch_base_libdir}/firmware/qcom/qcm2290/wlanmdsp.mbn" 1434FILES:${PN}-qcom-qcm2290-wifi = "${nonarch_base_libdir}/firmware/qcom/qcm2290/wlanmdsp.mbn ${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/qcm2290/wlanmdsp.mbn"
1414FILES:${PN}-qcom-qrb4210-adreno = "${nonarch_base_libdir}/firmware/qcom/qrb4210/a610_zap.mbn" 1435FILES:${PN}-qcom-qrb4210-adreno = "${nonarch_base_libdir}/firmware/qcom/qrb4210/a610_zap.mbn"
1415FILES:${PN}-qcom-qrb4210-audio = "${nonarch_base_libdir}/firmware/qcom/qrb4210/adsp*.*" 1436FILES:${PN}-qcom-qrb4210-audio = "${nonarch_base_libdir}/firmware/qcom/qrb4210/adsp*.*"
1416FILES:${PN}-qcom-qrb4210-compute = "${nonarch_base_libdir}/firmware/qcom/qrb4210/cdsp*.*" 1437FILES:${PN}-qcom-qrb4210-compute = "${nonarch_base_libdir}/firmware/qcom/qrb4210/cdsp*.*"
1417FILES:${PN}-qcom-qrb4210-modem = "${nonarch_base_libdir}/firmware/qcom/qrb4210/modem*.*" 1438FILES:${PN}-qcom-qrb4210-modem = "${nonarch_base_libdir}/firmware/qcom/qrb4210/modem*.*"
1418FILES:${PN}-qcom-qrb4210-wifi = "${nonarch_base_libdir}/firmware/qcom/qrb4210/wlanmdsp.mbn" 1439FILES:${PN}-qcom-qrb4210-wifi = "${nonarch_base_libdir}/firmware/qcom/qrb4210/wlanmdsp.mbn ${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/qrb4210/wlanmdsp.mbn"
1419FILES:${PN}-qcom-sc8280xp-lenovo-x13s-compat = "${nonarch_base_libdir}/firmware/qcom/LENOVO/21BX" 1440FILES:${PN}-qcom-sc8280xp-lenovo-x13s-compat = "${nonarch_base_libdir}/firmware/qcom/LENOVO/21BX"
1420FILES:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*adsp*.* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin ${nonarch_base_libdir}/firmware/qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin" 1441FILES:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/*adsp*.* ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn ${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin ${nonarch_base_libdir}/firmware/qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin"
1421FILES:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn" 1442FILES:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${nonarch_base_libdir}/firmware/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"
@@ -1424,7 +1445,8 @@ FILES:${PN}-qcom-sc8280xp-lenovo-x13s-sensors = "${nonarch_base_libdir}/firmware
1424FILES:${PN}-qcom-sdm845-adreno = "${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" 1445FILES:${PN}-qcom-sdm845-adreno = "${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*"
1425FILES:${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" 1446FILES:${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*"
1426FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" 1447FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*"
1427FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/notice.txt_wlanmdsp" 1448FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/notice.txt_wlanmdsp \
1449 ${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn ${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp"
1428FILES:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "${nonarch_base_libdir}/firmware/qcom/sdm845/Thundercomm/db845c/slpi*.*" 1450FILES:${PN}-qcom-sdm845-thundercomm-db845c-sensors = "${nonarch_base_libdir}/firmware/qcom/sdm845/Thundercomm/db845c/slpi*.*"
1429FILES:${PN}-qcom-sm8250-adreno = "${nonarch_base_libdir}/firmware/qcom/sm8250/a650*.*" 1451FILES:${PN}-qcom-sm8250-adreno = "${nonarch_base_libdir}/firmware/qcom/sm8250/a650*.*"
1430FILES:${PN}-qcom-sm8250-audio = "${nonarch_base_libdir}/firmware/qcom/sm8250/adsp*.*" 1452FILES:${PN}-qcom-sm8250-audio = "${nonarch_base_libdir}/firmware/qcom/sm8250/adsp*.*"
@@ -1459,7 +1481,9 @@ RDEPENDS:${PN}-qcom-qrb4210-adreno = "${PN}-qcom-license"
1459RDEPENDS:${PN}-qcom-qrb4210-audio = "${PN}-qcom-license" 1481RDEPENDS:${PN}-qcom-qrb4210-audio = "${PN}-qcom-license"
1460RDEPENDS:${PN}-qcom-qrb4210-compute = "${PN}-qcom-license" 1482RDEPENDS:${PN}-qcom-qrb4210-compute = "${PN}-qcom-license"
1461RDEPENDS:${PN}-qcom-qrb4210-modem = "${PN}-qcom-license" 1483RDEPENDS:${PN}-qcom-qrb4210-modem = "${PN}-qcom-license"
1462RDEPENDS:${PN}-qcom-qrb4210-wifi = "${PN}-qcom-license" 1484# Only symlinks in qcom-qrb4210-wifi, firmware is in qcom-qcm2290-wifi
1485# c.f. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=650e88378e76d5fad3997a5398f1ade47a74d924
1486RDEPENDS:${PN}-qcom-qrb4210-wifi = "${PN}-qcom-license ${PN}-qcom-qcm2290-wifi"
1463RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${PN}-qcom-license" 1487RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-audio = "${PN}-qcom-license"
1464RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${PN}-qcom-license" 1488RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-adreno = "${PN}-qcom-license"
1465RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "${PN}-qcom-license" 1489RDEPENDS:${PN}-qcom-sc8280xp-lenovo-x13s-compute = "${PN}-qcom-license"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.6.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb
index d68de6ec7e..3dd4d547d5 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.6.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.9.bb
@@ -12,6 +12,6 @@ SRC_URI += "\
12 12
13LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 13LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
14 14
15SRC_URI[sha256sum] = "d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0" 15SRC_URI[sha256sum] = "24fa01fb989c7a3e28453f117799168713766e119c5381dac30115f18f268149"
16 16
17 17
diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.6.inc b/meta/recipes-kernel/linux/cve-exclusion_6.6.inc
index 0e42cea24a..32a0701edf 100644
--- a/meta/recipes-kernel/linux/cve-exclusion_6.6.inc
+++ b/meta/recipes-kernel/linux/cve-exclusion_6.6.inc
@@ -1,14 +1,14 @@
1 1
2# Auto-generated CVE metadata, DO NOT EDIT BY HAND. 2# Auto-generated CVE metadata, DO NOT EDIT BY HAND.
3# Generated at 2024-03-19 21:27:37.303325+00:00 for version 6.6.22 3# Generated at 2024-06-06 20:41:33.044442+00:00 for version 6.6.32
4 4
5python check_kernel_cve_status_version() { 5#python check_kernel_cve_status_version() {
6 this_version = "6.6.22" 6# this_version = "6.6.29"
7 kernel_version = d.getVar("LINUX_VERSION") 7# kernel_version = d.getVar("LINUX_VERSION")
8 if kernel_version != this_version: 8# if kernel_version != this_version:
9 bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) 9# bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version))
10} 10#}
11do_cve_check[prefuncs] += "check_kernel_cve_status_version" 11#do_cve_check[prefuncs] += "check_kernel_cve_status_version"
12 12
13CVE_STATUS[CVE-2003-1604] = "fixed-version: Fixed from version 2.6.12rc2" 13CVE_STATUS[CVE-2003-1604] = "fixed-version: Fixed from version 2.6.12rc2"
14 14
@@ -2980,6 +2980,10 @@ CVE_STATUS[CVE-2019-25044] = "fixed-version: Fixed from version 5.2rc4"
2980 2980
2981CVE_STATUS[CVE-2019-25045] = "fixed-version: Fixed from version 5.1" 2981CVE_STATUS[CVE-2019-25045] = "fixed-version: Fixed from version 5.1"
2982 2982
2983CVE_STATUS[CVE-2019-25160] = "fixed-version: Fixed from version 5.0"
2984
2985CVE_STATUS[CVE-2019-25162] = "fixed-version: Fixed from version 6.0rc1"
2986
2983CVE_STATUS[CVE-2019-3016] = "fixed-version: Fixed from version 5.6rc1" 2987CVE_STATUS[CVE-2019-3016] = "fixed-version: Fixed from version 5.6rc1"
2984 2988
2985CVE_STATUS[CVE-2019-3459] = "fixed-version: Fixed from version 5.1rc1" 2989CVE_STATUS[CVE-2019-3459] = "fixed-version: Fixed from version 5.1rc1"
@@ -3452,6 +3456,32 @@ CVE_STATUS[CVE-2020-36694] = "fixed-version: Fixed from version 5.10"
3452 3456
3453CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1" 3457CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1"
3454 3458
3459CVE_STATUS[CVE-2020-36775] = "fixed-version: Fixed from version 5.7rc1"
3460
3461CVE_STATUS[CVE-2020-36776] = "fixed-version: Fixed from version 5.13rc1"
3462
3463CVE_STATUS[CVE-2020-36777] = "fixed-version: Fixed from version 5.13rc1"
3464
3465CVE_STATUS[CVE-2020-36778] = "fixed-version: Fixed from version 5.13rc1"
3466
3467CVE_STATUS[CVE-2020-36779] = "fixed-version: Fixed from version 5.13rc1"
3468
3469CVE_STATUS[CVE-2020-36780] = "fixed-version: Fixed from version 5.13rc1"
3470
3471CVE_STATUS[CVE-2020-36781] = "fixed-version: Fixed from version 5.13rc1"
3472
3473CVE_STATUS[CVE-2020-36782] = "fixed-version: Fixed from version 5.13rc1"
3474
3475CVE_STATUS[CVE-2020-36783] = "fixed-version: Fixed from version 5.13rc1"
3476
3477CVE_STATUS[CVE-2020-36784] = "fixed-version: Fixed from version 5.13rc1"
3478
3479CVE_STATUS[CVE-2020-36785] = "fixed-version: Fixed from version 5.13rc1"
3480
3481CVE_STATUS[CVE-2020-36786] = "fixed-version: Fixed from version 5.13rc1"
3482
3483CVE_STATUS[CVE-2020-36787] = "fixed-version: Fixed from version 5.13rc1"
3484
3455CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" 3485CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1"
3456 3486
3457CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" 3487CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5"
@@ -3940,6 +3970,540 @@ CVE_STATUS[CVE-2021-45868] = "fixed-version: Fixed from version 5.16rc1"
3940 3970
3941CVE_STATUS[CVE-2021-46283] = "fixed-version: Fixed from version 5.13rc7" 3971CVE_STATUS[CVE-2021-46283] = "fixed-version: Fixed from version 5.13rc7"
3942 3972
3973CVE_STATUS[CVE-2021-46904] = "fixed-version: Fixed from version 5.12rc7"
3974
3975CVE_STATUS[CVE-2021-46905] = "fixed-version: Fixed from version 5.13rc1"
3976
3977CVE_STATUS[CVE-2021-46906] = "fixed-version: Fixed from version 5.13rc5"
3978
3979CVE_STATUS[CVE-2021-46908] = "fixed-version: Fixed from version 5.12rc8"
3980
3981CVE_STATUS[CVE-2021-46909] = "fixed-version: Fixed from version 5.12rc8"
3982
3983CVE_STATUS[CVE-2021-46910] = "fixed-version: Fixed from version 5.12rc8"
3984
3985CVE_STATUS[CVE-2021-46911] = "fixed-version: Fixed from version 5.12rc8"
3986
3987CVE_STATUS[CVE-2021-46912] = "fixed-version: Fixed from version 5.12rc8"
3988
3989CVE_STATUS[CVE-2021-46913] = "fixed-version: Fixed from version 5.12rc8"
3990
3991CVE_STATUS[CVE-2021-46914] = "fixed-version: Fixed from version 5.12rc8"
3992
3993CVE_STATUS[CVE-2021-46915] = "fixed-version: Fixed from version 5.12rc8"
3994
3995CVE_STATUS[CVE-2021-46916] = "fixed-version: Fixed from version 5.12rc8"
3996
3997CVE_STATUS[CVE-2021-46917] = "fixed-version: Fixed from version 5.12rc8"
3998
3999CVE_STATUS[CVE-2021-46918] = "fixed-version: Fixed from version 5.12rc8"
4000
4001CVE_STATUS[CVE-2021-46919] = "fixed-version: Fixed from version 5.12rc8"
4002
4003CVE_STATUS[CVE-2021-46920] = "fixed-version: Fixed from version 5.12rc8"
4004
4005CVE_STATUS[CVE-2021-46921] = "fixed-version: Fixed from version 5.12"
4006
4007CVE_STATUS[CVE-2021-46922] = "fixed-version: Fixed from version 5.12"
4008
4009CVE_STATUS[CVE-2021-46923] = "fixed-version: Fixed from version 5.16rc8"
4010
4011CVE_STATUS[CVE-2021-46924] = "fixed-version: Fixed from version 5.16rc8"
4012
4013CVE_STATUS[CVE-2021-46925] = "fixed-version: Fixed from version 5.16rc8"
4014
4015CVE_STATUS[CVE-2021-46926] = "fixed-version: Fixed from version 5.16rc7"
4016
4017CVE_STATUS[CVE-2021-46927] = "fixed-version: Fixed from version 5.16rc8"
4018
4019CVE_STATUS[CVE-2021-46928] = "fixed-version: Fixed from version 5.16rc7"
4020
4021CVE_STATUS[CVE-2021-46929] = "fixed-version: Fixed from version 5.16rc8"
4022
4023CVE_STATUS[CVE-2021-46930] = "fixed-version: Fixed from version 5.16rc8"
4024
4025CVE_STATUS[CVE-2021-46931] = "fixed-version: Fixed from version 5.16rc8"
4026
4027CVE_STATUS[CVE-2021-46932] = "fixed-version: Fixed from version 5.16rc8"
4028
4029CVE_STATUS[CVE-2021-46933] = "fixed-version: Fixed from version 5.16rc8"
4030
4031CVE_STATUS[CVE-2021-46934] = "fixed-version: Fixed from version 5.16rc8"
4032
4033CVE_STATUS[CVE-2021-46935] = "fixed-version: Fixed from version 5.16rc8"
4034
4035CVE_STATUS[CVE-2021-46936] = "fixed-version: Fixed from version 5.16rc8"
4036
4037CVE_STATUS[CVE-2021-46937] = "fixed-version: Fixed from version 5.16rc8"
4038
4039CVE_STATUS[CVE-2021-46938] = "fixed-version: Fixed from version 5.13rc1"
4040
4041CVE_STATUS[CVE-2021-46939] = "fixed-version: Fixed from version 5.13rc1"
4042
4043CVE_STATUS[CVE-2021-46940] = "fixed-version: Fixed from version 5.13rc1"
4044
4045CVE_STATUS[CVE-2021-46941] = "fixed-version: Fixed from version 5.13rc1"
4046
4047CVE_STATUS[CVE-2021-46942] = "fixed-version: Fixed from version 5.13rc1"
4048
4049CVE_STATUS[CVE-2021-46943] = "fixed-version: Fixed from version 5.13rc1"
4050
4051CVE_STATUS[CVE-2021-46944] = "fixed-version: Fixed from version 5.13rc1"
4052
4053CVE_STATUS[CVE-2021-46945] = "fixed-version: Fixed from version 5.13rc1"
4054
4055CVE_STATUS[CVE-2021-46947] = "fixed-version: Fixed from version 5.13rc1"
4056
4057CVE_STATUS[CVE-2021-46948] = "fixed-version: Fixed from version 5.13rc1"
4058
4059CVE_STATUS[CVE-2021-46949] = "fixed-version: Fixed from version 5.13rc1"
4060
4061CVE_STATUS[CVE-2021-46950] = "fixed-version: Fixed from version 5.13rc1"
4062
4063CVE_STATUS[CVE-2021-46951] = "fixed-version: Fixed from version 5.13rc1"
4064
4065CVE_STATUS[CVE-2021-46952] = "fixed-version: Fixed from version 5.13rc1"
4066
4067CVE_STATUS[CVE-2021-46953] = "fixed-version: Fixed from version 5.13rc1"
4068
4069CVE_STATUS[CVE-2021-46954] = "fixed-version: Fixed from version 5.13rc1"
4070
4071CVE_STATUS[CVE-2021-46955] = "fixed-version: Fixed from version 5.13rc1"
4072
4073CVE_STATUS[CVE-2021-46956] = "fixed-version: Fixed from version 5.13rc1"
4074
4075CVE_STATUS[CVE-2021-46957] = "fixed-version: Fixed from version 5.13rc1"
4076
4077CVE_STATUS[CVE-2021-46958] = "fixed-version: Fixed from version 5.13rc1"
4078
4079CVE_STATUS[CVE-2021-46959] = "fixed-version: Fixed from version 5.13rc1"
4080
4081CVE_STATUS[CVE-2021-46960] = "fixed-version: Fixed from version 5.13rc1"
4082
4083CVE_STATUS[CVE-2021-46961] = "fixed-version: Fixed from version 5.13rc1"
4084
4085CVE_STATUS[CVE-2021-46962] = "fixed-version: Fixed from version 5.13rc1"
4086
4087CVE_STATUS[CVE-2021-46963] = "fixed-version: Fixed from version 5.13rc1"
4088
4089CVE_STATUS[CVE-2021-46964] = "fixed-version: Fixed from version 5.13rc1"
4090
4091CVE_STATUS[CVE-2021-46965] = "fixed-version: Fixed from version 5.13rc1"
4092
4093CVE_STATUS[CVE-2021-46966] = "fixed-version: Fixed from version 5.13rc1"
4094
4095CVE_STATUS[CVE-2021-46967] = "fixed-version: Fixed from version 5.13rc1"
4096
4097CVE_STATUS[CVE-2021-46968] = "fixed-version: Fixed from version 5.13rc1"
4098
4099CVE_STATUS[CVE-2021-46969] = "fixed-version: Fixed from version 5.13rc1"
4100
4101CVE_STATUS[CVE-2021-46970] = "fixed-version: Fixed from version 5.13rc1"
4102
4103CVE_STATUS[CVE-2021-46971] = "fixed-version: Fixed from version 5.13rc1"
4104
4105CVE_STATUS[CVE-2021-46972] = "fixed-version: Fixed from version 5.13rc1"
4106
4107CVE_STATUS[CVE-2021-46973] = "fixed-version: Fixed from version 5.13rc1"
4108
4109CVE_STATUS[CVE-2021-46974] = "fixed-version: Fixed from version 5.13rc1"
4110
4111CVE_STATUS[CVE-2021-46976] = "fixed-version: Fixed from version 5.13rc2"
4112
4113CVE_STATUS[CVE-2021-46977] = "fixed-version: Fixed from version 5.13rc2"
4114
4115CVE_STATUS[CVE-2021-46978] = "fixed-version: Fixed from version 5.13rc2"
4116
4117CVE_STATUS[CVE-2021-46979] = "fixed-version: Fixed from version 5.13rc2"
4118
4119CVE_STATUS[CVE-2021-46980] = "fixed-version: Fixed from version 5.13rc2"
4120
4121CVE_STATUS[CVE-2021-46981] = "fixed-version: Fixed from version 5.13rc2"
4122
4123CVE_STATUS[CVE-2021-46982] = "fixed-version: Fixed from version 5.13rc2"
4124
4125CVE_STATUS[CVE-2021-46983] = "fixed-version: Fixed from version 5.13rc2"
4126
4127CVE_STATUS[CVE-2021-46984] = "fixed-version: Fixed from version 5.13rc2"
4128
4129CVE_STATUS[CVE-2021-46985] = "fixed-version: Fixed from version 5.13rc2"
4130
4131CVE_STATUS[CVE-2021-46986] = "fixed-version: Fixed from version 5.13rc2"
4132
4133CVE_STATUS[CVE-2021-46987] = "fixed-version: Fixed from version 5.13rc2"
4134
4135CVE_STATUS[CVE-2021-46988] = "fixed-version: Fixed from version 5.13rc2"
4136
4137CVE_STATUS[CVE-2021-46989] = "fixed-version: Fixed from version 5.13rc2"
4138
4139CVE_STATUS[CVE-2021-46990] = "fixed-version: Fixed from version 5.13rc2"
4140
4141CVE_STATUS[CVE-2021-46991] = "fixed-version: Fixed from version 5.13rc1"
4142
4143CVE_STATUS[CVE-2021-46992] = "fixed-version: Fixed from version 5.13rc1"
4144
4145CVE_STATUS[CVE-2021-46993] = "fixed-version: Fixed from version 5.13rc1"
4146
4147CVE_STATUS[CVE-2021-46994] = "fixed-version: Fixed from version 5.13rc1"
4148
4149CVE_STATUS[CVE-2021-46995] = "fixed-version: Fixed from version 5.13rc1"
4150
4151CVE_STATUS[CVE-2021-46996] = "fixed-version: Fixed from version 5.13rc1"
4152
4153CVE_STATUS[CVE-2021-46997] = "fixed-version: Fixed from version 5.13rc1"
4154
4155CVE_STATUS[CVE-2021-46998] = "fixed-version: Fixed from version 5.13rc1"
4156
4157CVE_STATUS[CVE-2021-46999] = "fixed-version: Fixed from version 5.13rc1"
4158
4159CVE_STATUS[CVE-2021-47000] = "fixed-version: Fixed from version 5.13rc1"
4160
4161CVE_STATUS[CVE-2021-47001] = "fixed-version: Fixed from version 5.13rc1"
4162
4163CVE_STATUS[CVE-2021-47002] = "fixed-version: Fixed from version 5.13rc1"
4164
4165CVE_STATUS[CVE-2021-47003] = "fixed-version: Fixed from version 5.13rc1"
4166
4167CVE_STATUS[CVE-2021-47004] = "fixed-version: Fixed from version 5.13rc1"
4168
4169CVE_STATUS[CVE-2021-47005] = "fixed-version: Fixed from version 5.13rc1"
4170
4171CVE_STATUS[CVE-2021-47006] = "fixed-version: Fixed from version 5.13rc1"
4172
4173CVE_STATUS[CVE-2021-47007] = "fixed-version: Fixed from version 5.13rc1"
4174
4175CVE_STATUS[CVE-2021-47008] = "fixed-version: Fixed from version 5.13rc1"
4176
4177CVE_STATUS[CVE-2021-47009] = "fixed-version: Fixed from version 5.13rc2"
4178
4179CVE_STATUS[CVE-2021-47010] = "fixed-version: Fixed from version 5.13rc1"
4180
4181CVE_STATUS[CVE-2021-47011] = "fixed-version: Fixed from version 5.13rc1"
4182
4183CVE_STATUS[CVE-2021-47012] = "fixed-version: Fixed from version 5.13rc1"
4184
4185CVE_STATUS[CVE-2021-47013] = "fixed-version: Fixed from version 5.13rc1"
4186
4187CVE_STATUS[CVE-2021-47014] = "fixed-version: Fixed from version 5.13rc1"
4188
4189CVE_STATUS[CVE-2021-47015] = "fixed-version: Fixed from version 5.13rc1"
4190
4191CVE_STATUS[CVE-2021-47016] = "fixed-version: Fixed from version 5.13rc1"
4192
4193CVE_STATUS[CVE-2021-47017] = "fixed-version: Fixed from version 5.13rc1"
4194
4195CVE_STATUS[CVE-2021-47018] = "fixed-version: Fixed from version 5.13rc1"
4196
4197CVE_STATUS[CVE-2021-47019] = "fixed-version: Fixed from version 5.13rc1"
4198
4199CVE_STATUS[CVE-2021-47020] = "fixed-version: Fixed from version 5.13rc1"
4200
4201CVE_STATUS[CVE-2021-47021] = "fixed-version: Fixed from version 5.13rc1"
4202
4203CVE_STATUS[CVE-2021-47022] = "fixed-version: Fixed from version 5.13rc1"
4204
4205CVE_STATUS[CVE-2021-47023] = "fixed-version: Fixed from version 5.13rc1"
4206
4207CVE_STATUS[CVE-2021-47024] = "fixed-version: Fixed from version 5.13rc1"
4208
4209CVE_STATUS[CVE-2021-47025] = "fixed-version: Fixed from version 5.13rc1"
4210
4211CVE_STATUS[CVE-2021-47026] = "fixed-version: Fixed from version 5.13rc1"
4212
4213CVE_STATUS[CVE-2021-47027] = "fixed-version: Fixed from version 5.13rc1"
4214
4215CVE_STATUS[CVE-2021-47028] = "fixed-version: Fixed from version 5.13rc1"
4216
4217CVE_STATUS[CVE-2021-47029] = "fixed-version: Fixed from version 5.13rc1"
4218
4219CVE_STATUS[CVE-2021-47030] = "fixed-version: Fixed from version 5.13rc1"
4220
4221CVE_STATUS[CVE-2021-47031] = "fixed-version: Fixed from version 5.13rc1"
4222
4223CVE_STATUS[CVE-2021-47032] = "fixed-version: Fixed from version 5.13rc1"
4224
4225CVE_STATUS[CVE-2021-47033] = "fixed-version: Fixed from version 5.13rc1"
4226
4227CVE_STATUS[CVE-2021-47034] = "fixed-version: Fixed from version 5.13rc1"
4228
4229CVE_STATUS[CVE-2021-47035] = "fixed-version: Fixed from version 5.13rc1"
4230
4231CVE_STATUS[CVE-2021-47036] = "fixed-version: Fixed from version 5.13rc1"
4232
4233CVE_STATUS[CVE-2021-47037] = "fixed-version: Fixed from version 5.13rc1"
4234
4235CVE_STATUS[CVE-2021-47038] = "fixed-version: Fixed from version 5.13rc1"
4236
4237CVE_STATUS[CVE-2021-47039] = "fixed-version: Fixed from version 5.13rc1"
4238
4239CVE_STATUS[CVE-2021-47040] = "fixed-version: Fixed from version 5.13rc1"
4240
4241CVE_STATUS[CVE-2021-47041] = "fixed-version: Fixed from version 5.13rc1"
4242
4243CVE_STATUS[CVE-2021-47042] = "fixed-version: Fixed from version 5.13rc1"
4244
4245CVE_STATUS[CVE-2021-47043] = "fixed-version: Fixed from version 5.13rc1"
4246
4247CVE_STATUS[CVE-2021-47044] = "fixed-version: Fixed from version 5.13rc1"
4248
4249CVE_STATUS[CVE-2021-47045] = "fixed-version: Fixed from version 5.13rc1"
4250
4251CVE_STATUS[CVE-2021-47046] = "fixed-version: Fixed from version 5.13rc1"
4252
4253CVE_STATUS[CVE-2021-47047] = "fixed-version: Fixed from version 5.13rc1"
4254
4255CVE_STATUS[CVE-2021-47048] = "fixed-version: Fixed from version 5.13rc1"
4256
4257CVE_STATUS[CVE-2021-47049] = "fixed-version: Fixed from version 5.13rc1"
4258
4259CVE_STATUS[CVE-2021-47050] = "fixed-version: Fixed from version 5.13rc1"
4260
4261CVE_STATUS[CVE-2021-47051] = "fixed-version: Fixed from version 5.13rc1"
4262
4263CVE_STATUS[CVE-2021-47052] = "fixed-version: Fixed from version 5.13rc1"
4264
4265CVE_STATUS[CVE-2021-47053] = "fixed-version: Fixed from version 5.13rc1"
4266
4267CVE_STATUS[CVE-2021-47054] = "fixed-version: Fixed from version 5.13rc1"
4268
4269CVE_STATUS[CVE-2021-47055] = "fixed-version: Fixed from version 5.13rc1"
4270
4271CVE_STATUS[CVE-2021-47056] = "fixed-version: Fixed from version 5.13rc1"
4272
4273CVE_STATUS[CVE-2021-47057] = "fixed-version: Fixed from version 5.13rc1"
4274
4275CVE_STATUS[CVE-2021-47058] = "fixed-version: Fixed from version 5.13rc1"
4276
4277CVE_STATUS[CVE-2021-47059] = "fixed-version: Fixed from version 5.13rc1"
4278
4279CVE_STATUS[CVE-2021-47060] = "fixed-version: Fixed from version 5.13rc1"
4280
4281CVE_STATUS[CVE-2021-47061] = "fixed-version: Fixed from version 5.13rc1"
4282
4283CVE_STATUS[CVE-2021-47062] = "fixed-version: Fixed from version 5.13rc1"
4284
4285CVE_STATUS[CVE-2021-47063] = "fixed-version: Fixed from version 5.13rc1"
4286
4287CVE_STATUS[CVE-2021-47064] = "fixed-version: Fixed from version 5.13rc1"
4288
4289CVE_STATUS[CVE-2021-47065] = "fixed-version: Fixed from version 5.13rc1"
4290
4291CVE_STATUS[CVE-2021-47066] = "fixed-version: Fixed from version 5.13rc1"
4292
4293CVE_STATUS[CVE-2021-47067] = "fixed-version: Fixed from version 5.13rc1"
4294
4295CVE_STATUS[CVE-2021-47068] = "fixed-version: Fixed from version 5.13rc1"
4296
4297CVE_STATUS[CVE-2021-47069] = "fixed-version: Fixed from version 5.13rc3"
4298
4299CVE_STATUS[CVE-2021-47070] = "fixed-version: Fixed from version 5.13rc3"
4300
4301CVE_STATUS[CVE-2021-47071] = "fixed-version: Fixed from version 5.13rc3"
4302
4303CVE_STATUS[CVE-2021-47072] = "fixed-version: Fixed from version 5.13rc3"
4304
4305CVE_STATUS[CVE-2021-47073] = "fixed-version: Fixed from version 5.13rc3"
4306
4307CVE_STATUS[CVE-2021-47074] = "fixed-version: Fixed from version 5.13rc3"
4308
4309CVE_STATUS[CVE-2021-47075] = "fixed-version: Fixed from version 5.13rc3"
4310
4311CVE_STATUS[CVE-2021-47076] = "fixed-version: Fixed from version 5.13rc3"
4312
4313CVE_STATUS[CVE-2021-47077] = "fixed-version: Fixed from version 5.13rc3"
4314
4315CVE_STATUS[CVE-2021-47078] = "fixed-version: Fixed from version 5.13rc3"
4316
4317CVE_STATUS[CVE-2021-47079] = "fixed-version: Fixed from version 5.13rc3"
4318
4319CVE_STATUS[CVE-2021-47080] = "fixed-version: Fixed from version 5.13rc3"
4320
4321CVE_STATUS[CVE-2021-47081] = "fixed-version: Fixed from version 5.13rc3"
4322
4323CVE_STATUS[CVE-2021-47082] = "fixed-version: Fixed from version 5.16rc7"
4324
4325CVE_STATUS[CVE-2021-47083] = "fixed-version: Fixed from version 5.16rc7"
4326
4327CVE_STATUS[CVE-2021-47086] = "fixed-version: Fixed from version 5.16rc7"
4328
4329CVE_STATUS[CVE-2021-47087] = "fixed-version: Fixed from version 5.16rc7"
4330
4331CVE_STATUS[CVE-2021-47088] = "fixed-version: Fixed from version 5.16rc7"
4332
4333CVE_STATUS[CVE-2021-47089] = "fixed-version: Fixed from version 5.16rc7"
4334
4335CVE_STATUS[CVE-2021-47090] = "fixed-version: Fixed from version 5.16rc7"
4336
4337CVE_STATUS[CVE-2021-47091] = "fixed-version: Fixed from version 5.16rc7"
4338
4339CVE_STATUS[CVE-2021-47092] = "fixed-version: Fixed from version 5.16rc7"
4340
4341CVE_STATUS[CVE-2021-47093] = "fixed-version: Fixed from version 5.16rc7"
4342
4343CVE_STATUS[CVE-2021-47094] = "fixed-version: Fixed from version 5.16rc7"
4344
4345CVE_STATUS[CVE-2021-47095] = "fixed-version: Fixed from version 5.16rc7"
4346
4347CVE_STATUS[CVE-2021-47096] = "fixed-version: Fixed from version 5.16rc7"
4348
4349CVE_STATUS[CVE-2021-47097] = "fixed-version: Fixed from version 5.16rc7"
4350
4351CVE_STATUS[CVE-2021-47098] = "fixed-version: Fixed from version 5.16rc7"
4352
4353CVE_STATUS[CVE-2021-47099] = "fixed-version: Fixed from version 5.16rc7"
4354
4355CVE_STATUS[CVE-2021-47100] = "fixed-version: Fixed from version 5.16rc7"
4356
4357CVE_STATUS[CVE-2021-47101] = "fixed-version: Fixed from version 5.16rc7"
4358
4359CVE_STATUS[CVE-2021-47102] = "fixed-version: Fixed from version 5.16rc7"
4360
4361CVE_STATUS[CVE-2021-47103] = "fixed-version: Fixed from version 5.16rc7"
4362
4363CVE_STATUS[CVE-2021-47104] = "fixed-version: Fixed from version 5.16rc7"
4364
4365CVE_STATUS[CVE-2021-47105] = "fixed-version: Fixed from version 5.16rc7"
4366
4367CVE_STATUS[CVE-2021-47106] = "fixed-version: Fixed from version 5.16rc7"
4368
4369CVE_STATUS[CVE-2021-47107] = "fixed-version: Fixed from version 5.16rc7"
4370
4371CVE_STATUS[CVE-2021-47108] = "fixed-version: Fixed from version 5.16rc7"
4372
4373CVE_STATUS[CVE-2021-47109] = "fixed-version: Fixed from version 5.13rc7"
4374
4375CVE_STATUS[CVE-2021-47110] = "fixed-version: Fixed from version 5.13rc2"
4376
4377CVE_STATUS[CVE-2021-47111] = "fixed-version: Fixed from version 5.13rc6"
4378
4379CVE_STATUS[CVE-2021-47112] = "fixed-version: Fixed from version 5.13rc2"
4380
4381CVE_STATUS[CVE-2021-47113] = "fixed-version: Fixed from version 5.13rc5"
4382
4383CVE_STATUS[CVE-2021-47114] = "fixed-version: Fixed from version 5.13rc5"
4384
4385CVE_STATUS[CVE-2021-47116] = "fixed-version: Fixed from version 5.13rc5"
4386
4387CVE_STATUS[CVE-2021-47117] = "fixed-version: Fixed from version 5.13rc5"
4388
4389CVE_STATUS[CVE-2021-47118] = "fixed-version: Fixed from version 5.13rc5"
4390
4391CVE_STATUS[CVE-2021-47119] = "fixed-version: Fixed from version 5.13rc5"
4392
4393CVE_STATUS[CVE-2021-47120] = "fixed-version: Fixed from version 5.13rc5"
4394
4395CVE_STATUS[CVE-2021-47121] = "fixed-version: Fixed from version 5.13rc5"
4396
4397CVE_STATUS[CVE-2021-47122] = "fixed-version: Fixed from version 5.13rc5"
4398
4399CVE_STATUS[CVE-2021-47123] = "fixed-version: Fixed from version 5.13rc2"
4400
4401CVE_STATUS[CVE-2021-47124] = "fixed-version: Fixed from version 5.13rc2"
4402
4403CVE_STATUS[CVE-2021-47125] = "fixed-version: Fixed from version 5.13rc5"
4404
4405CVE_STATUS[CVE-2021-47126] = "fixed-version: Fixed from version 5.13rc5"
4406
4407CVE_STATUS[CVE-2021-47127] = "fixed-version: Fixed from version 5.13rc5"
4408
4409CVE_STATUS[CVE-2021-47128] = "fixed-version: Fixed from version 5.13rc5"
4410
4411CVE_STATUS[CVE-2021-47129] = "fixed-version: Fixed from version 5.13rc5"
4412
4413CVE_STATUS[CVE-2021-47130] = "fixed-version: Fixed from version 5.13rc5"
4414
4415CVE_STATUS[CVE-2021-47131] = "fixed-version: Fixed from version 5.13rc5"
4416
4417CVE_STATUS[CVE-2021-47132] = "fixed-version: Fixed from version 5.13rc5"
4418
4419CVE_STATUS[CVE-2021-47133] = "fixed-version: Fixed from version 5.13rc5"
4420
4421CVE_STATUS[CVE-2021-47134] = "fixed-version: Fixed from version 5.13rc5"
4422
4423CVE_STATUS[CVE-2021-47135] = "fixed-version: Fixed from version 5.13rc5"
4424
4425CVE_STATUS[CVE-2021-47136] = "fixed-version: Fixed from version 5.13rc4"
4426
4427CVE_STATUS[CVE-2021-47137] = "fixed-version: Fixed from version 5.13rc4"
4428
4429CVE_STATUS[CVE-2021-47138] = "fixed-version: Fixed from version 5.13rc4"
4430
4431CVE_STATUS[CVE-2021-47139] = "fixed-version: Fixed from version 5.13rc4"
4432
4433CVE_STATUS[CVE-2021-47140] = "fixed-version: Fixed from version 5.13rc4"
4434
4435CVE_STATUS[CVE-2021-47141] = "fixed-version: Fixed from version 5.13rc4"
4436
4437CVE_STATUS[CVE-2021-47142] = "fixed-version: Fixed from version 5.13rc3"
4438
4439CVE_STATUS[CVE-2021-47143] = "fixed-version: Fixed from version 5.13rc4"
4440
4441CVE_STATUS[CVE-2021-47144] = "fixed-version: Fixed from version 5.13rc3"
4442
4443CVE_STATUS[CVE-2021-47145] = "fixed-version: Fixed from version 5.13rc3"
4444
4445CVE_STATUS[CVE-2021-47146] = "fixed-version: Fixed from version 5.13rc4"
4446
4447CVE_STATUS[CVE-2021-47147] = "fixed-version: Fixed from version 5.13rc4"
4448
4449CVE_STATUS[CVE-2021-47148] = "fixed-version: Fixed from version 5.13rc4"
4450
4451CVE_STATUS[CVE-2021-47149] = "fixed-version: Fixed from version 5.13rc3"
4452
4453CVE_STATUS[CVE-2021-47150] = "fixed-version: Fixed from version 5.13rc4"
4454
4455CVE_STATUS[CVE-2021-47151] = "fixed-version: Fixed from version 5.13rc4"
4456
4457CVE_STATUS[CVE-2021-47152] = "fixed-version: Fixed from version 5.13rc4"
4458
4459CVE_STATUS[CVE-2021-47153] = "fixed-version: Fixed from version 5.13rc4"
4460
4461CVE_STATUS[CVE-2021-47158] = "fixed-version: Fixed from version 5.13rc4"
4462
4463CVE_STATUS[CVE-2021-47159] = "fixed-version: Fixed from version 5.13rc4"
4464
4465CVE_STATUS[CVE-2021-47160] = "fixed-version: Fixed from version 5.13rc4"
4466
4467CVE_STATUS[CVE-2021-47161] = "fixed-version: Fixed from version 5.13rc4"
4468
4469CVE_STATUS[CVE-2021-47162] = "fixed-version: Fixed from version 5.13rc4"
4470
4471CVE_STATUS[CVE-2021-47163] = "fixed-version: Fixed from version 5.13rc4"
4472
4473CVE_STATUS[CVE-2021-47164] = "fixed-version: Fixed from version 5.13rc4"
4474
4475CVE_STATUS[CVE-2021-47165] = "fixed-version: Fixed from version 5.13rc4"
4476
4477CVE_STATUS[CVE-2021-47166] = "fixed-version: Fixed from version 5.13rc4"
4478
4479CVE_STATUS[CVE-2021-47167] = "fixed-version: Fixed from version 5.13rc4"
4480
4481CVE_STATUS[CVE-2021-47168] = "fixed-version: Fixed from version 5.13rc4"
4482
4483CVE_STATUS[CVE-2021-47169] = "fixed-version: Fixed from version 5.13rc4"
4484
4485CVE_STATUS[CVE-2021-47170] = "fixed-version: Fixed from version 5.13rc4"
4486
4487CVE_STATUS[CVE-2021-47171] = "fixed-version: Fixed from version 5.13rc4"
4488
4489CVE_STATUS[CVE-2021-47172] = "fixed-version: Fixed from version 5.13rc4"
4490
4491CVE_STATUS[CVE-2021-47173] = "fixed-version: Fixed from version 5.13rc4"
4492
4493CVE_STATUS[CVE-2021-47174] = "fixed-version: Fixed from version 5.13rc4"
4494
4495CVE_STATUS[CVE-2021-47175] = "fixed-version: Fixed from version 5.13rc4"
4496
4497CVE_STATUS[CVE-2021-47176] = "fixed-version: Fixed from version 5.13rc4"
4498
4499CVE_STATUS[CVE-2021-47177] = "fixed-version: Fixed from version 5.13rc4"
4500
4501CVE_STATUS[CVE-2021-47178] = "fixed-version: Fixed from version 5.13rc4"
4502
4503CVE_STATUS[CVE-2021-47179] = "fixed-version: Fixed from version 5.13rc4"
4504
4505CVE_STATUS[CVE-2021-47180] = "fixed-version: Fixed from version 5.13rc4"
4506
3943CVE_STATUS[CVE-2022-0001] = "fixed-version: Fixed from version 5.17rc8" 4507CVE_STATUS[CVE-2022-0001] = "fixed-version: Fixed from version 5.17rc8"
3944 4508
3945CVE_STATUS[CVE-2022-0002] = "fixed-version: Fixed from version 5.17rc8" 4509CVE_STATUS[CVE-2022-0002] = "fixed-version: Fixed from version 5.17rc8"
@@ -4590,6 +5154,16 @@ CVE_STATUS[CVE-2022-48502] = "fixed-version: Fixed from version 6.2rc1"
4590 5154
4591CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1" 5155CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1"
4592 5156
5157CVE_STATUS[CVE-2022-48626] = "fixed-version: Fixed from version 5.17rc4"
5158
5159CVE_STATUS[CVE-2022-48627] = "fixed-version: Fixed from version 5.19rc7"
5160
5161CVE_STATUS[CVE-2022-48628] = "fixed-version: Fixed from version 6.6rc1"
5162
5163CVE_STATUS[CVE-2022-48629] = "fixed-version: Fixed from version 5.17"
5164
5165CVE_STATUS[CVE-2022-48630] = "fixed-version: Fixed from version 5.18"
5166
4593CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1" 5167CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1"
4594 5168
4595CVE_STATUS[CVE-2023-0045] = "fixed-version: Fixed from version 6.2rc3" 5169CVE_STATUS[CVE-2023-0045] = "fixed-version: Fixed from version 6.2rc3"
@@ -4834,6 +5408,8 @@ CVE_STATUS[CVE-2023-28466] = "fixed-version: Fixed from version 6.3rc2"
4834 5408
4835CVE_STATUS[CVE-2023-2860] = "fixed-version: Fixed from version 6.0rc5" 5409CVE_STATUS[CVE-2023-2860] = "fixed-version: Fixed from version 6.0rc5"
4836 5410
5411CVE_STATUS[CVE-2023-28746] = "cpe-stable-backport: Backported in 6.6.22"
5412
4837CVE_STATUS[CVE-2023-28772] = "fixed-version: Fixed from version 5.14rc1" 5413CVE_STATUS[CVE-2023-28772] = "fixed-version: Fixed from version 5.14rc1"
4838 5414
4839CVE_STATUS[CVE-2023-28866] = "fixed-version: Fixed from version 6.3rc4" 5415CVE_STATUS[CVE-2023-28866] = "fixed-version: Fixed from version 6.3rc4"
@@ -5112,7 +5688,7 @@ CVE_STATUS[CVE-2023-46838] = "cpe-stable-backport: Backported in 6.6.14"
5112 5688
5113CVE_STATUS[CVE-2023-46862] = "fixed-version: Fixed from version 6.6" 5689CVE_STATUS[CVE-2023-46862] = "fixed-version: Fixed from version 6.6"
5114 5690
5115# CVE-2023-47233 has no known resolution 5691CVE_STATUS[CVE-2023-47233] = "cpe-stable-backport: Backported in 6.6.24"
5116 5692
5117CVE_STATUS[CVE-2023-4732] = "fixed-version: Fixed from version 5.14rc1" 5693CVE_STATUS[CVE-2023-4732] = "fixed-version: Fixed from version 5.14rc1"
5118 5694
@@ -5208,6 +5784,294 @@ CVE_STATUS[CVE-2023-52463] = "cpe-stable-backport: Backported in 6.6.14"
5208 5784
5209CVE_STATUS[CVE-2023-52464] = "cpe-stable-backport: Backported in 6.6.14" 5785CVE_STATUS[CVE-2023-52464] = "cpe-stable-backport: Backported in 6.6.14"
5210 5786
5787CVE_STATUS[CVE-2023-52465] = "cpe-stable-backport: Backported in 6.6.14"
5788
5789CVE_STATUS[CVE-2023-52467] = "cpe-stable-backport: Backported in 6.6.14"
5790
5791CVE_STATUS[CVE-2023-52468] = "cpe-stable-backport: Backported in 6.6.14"
5792
5793CVE_STATUS[CVE-2023-52469] = "cpe-stable-backport: Backported in 6.6.14"
5794
5795CVE_STATUS[CVE-2023-52470] = "cpe-stable-backport: Backported in 6.6.14"
5796
5797CVE_STATUS[CVE-2023-52471] = "fixed-version: only affects 6.7rc1 onwards"
5798
5799CVE_STATUS[CVE-2023-52472] = "cpe-stable-backport: Backported in 6.6.14"
5800
5801CVE_STATUS[CVE-2023-52473] = "cpe-stable-backport: Backported in 6.6.14"
5802
5803CVE_STATUS[CVE-2023-52474] = "fixed-version: Fixed from version 6.4rc1"
5804
5805CVE_STATUS[CVE-2023-52475] = "fixed-version: Fixed from version 6.6rc6"
5806
5807CVE_STATUS[CVE-2023-52476] = "fixed-version: Fixed from version 6.6rc6"
5808
5809CVE_STATUS[CVE-2023-52477] = "fixed-version: Fixed from version 6.6rc6"
5810
5811CVE_STATUS[CVE-2023-52478] = "fixed-version: Fixed from version 6.6rc6"
5812
5813CVE_STATUS[CVE-2023-52479] = "fixed-version: Fixed from version 6.6rc5"
5814
5815CVE_STATUS[CVE-2023-52480] = "fixed-version: Fixed from version 6.6rc5"
5816
5817CVE_STATUS[CVE-2023-52481] = "fixed-version: Fixed from version 6.6rc5"
5818
5819CVE_STATUS[CVE-2023-52482] = "fixed-version: Fixed from version 6.6rc4"
5820
5821CVE_STATUS[CVE-2023-52483] = "fixed-version: Fixed from version 6.6rc6"
5822
5823CVE_STATUS[CVE-2023-52484] = "fixed-version: Fixed from version 6.6rc5"
5824
5825# CVE-2023-52485 needs backporting (fixed from 6.8rc1)
5826
5827CVE_STATUS[CVE-2023-52486] = "cpe-stable-backport: Backported in 6.6.15"
5828
5829CVE_STATUS[CVE-2023-52487] = "cpe-stable-backport: Backported in 6.6.15"
5830
5831CVE_STATUS[CVE-2023-52488] = "cpe-stable-backport: Backported in 6.6.15"
5832
5833CVE_STATUS[CVE-2023-52489] = "cpe-stable-backport: Backported in 6.6.15"
5834
5835CVE_STATUS[CVE-2023-52490] = "cpe-stable-backport: Backported in 6.6.15"
5836
5837CVE_STATUS[CVE-2023-52491] = "cpe-stable-backport: Backported in 6.6.15"
5838
5839CVE_STATUS[CVE-2023-52492] = "cpe-stable-backport: Backported in 6.6.15"
5840
5841CVE_STATUS[CVE-2023-52493] = "cpe-stable-backport: Backported in 6.6.15"
5842
5843CVE_STATUS[CVE-2023-52494] = "cpe-stable-backport: Backported in 6.6.15"
5844
5845CVE_STATUS[CVE-2023-52495] = "cpe-stable-backport: Backported in 6.6.15"
5846
5847CVE_STATUS[CVE-2023-52497] = "cpe-stable-backport: Backported in 6.6.15"
5848
5849CVE_STATUS[CVE-2023-52498] = "cpe-stable-backport: Backported in 6.6.15"
5850
5851CVE_STATUS[CVE-2023-52499] = "fixed-version: Fixed from version 6.6rc6"
5852
5853CVE_STATUS[CVE-2023-52500] = "fixed-version: Fixed from version 6.6rc2"
5854
5855CVE_STATUS[CVE-2023-52501] = "fixed-version: Fixed from version 6.6rc2"
5856
5857CVE_STATUS[CVE-2023-52502] = "fixed-version: Fixed from version 6.6rc6"
5858
5859CVE_STATUS[CVE-2023-52503] = "fixed-version: Fixed from version 6.6rc6"
5860
5861CVE_STATUS[CVE-2023-52504] = "fixed-version: Fixed from version 6.6rc6"
5862
5863CVE_STATUS[CVE-2023-52505] = "fixed-version: Fixed from version 6.6rc6"
5864
5865CVE_STATUS[CVE-2023-52506] = "fixed-version: Fixed from version 6.6rc3"
5866
5867CVE_STATUS[CVE-2023-52507] = "fixed-version: Fixed from version 6.6rc6"
5868
5869CVE_STATUS[CVE-2023-52508] = "fixed-version: Fixed from version 6.6rc2"
5870
5871CVE_STATUS[CVE-2023-52509] = "fixed-version: Fixed from version 6.6rc6"
5872
5873CVE_STATUS[CVE-2023-52510] = "fixed-version: Fixed from version 6.6rc6"
5874
5875CVE_STATUS[CVE-2023-52511] = "fixed-version: Fixed from version 6.6rc1"
5876
5877CVE_STATUS[CVE-2023-52512] = "fixed-version: Fixed from version 6.6rc6"
5878
5879CVE_STATUS[CVE-2023-52513] = "fixed-version: Fixed from version 6.6rc5"
5880
5881CVE_STATUS[CVE-2023-52515] = "fixed-version: Fixed from version 6.6rc5"
5882
5883CVE_STATUS[CVE-2023-52516] = "fixed-version: Fixed from version 6.6rc1"
5884
5885CVE_STATUS[CVE-2023-52517] = "fixed-version: Fixed from version 6.6rc1"
5886
5887CVE_STATUS[CVE-2023-52518] = "fixed-version: Fixed from version 6.6rc5"
5888
5889CVE_STATUS[CVE-2023-52519] = "fixed-version: Fixed from version 6.6rc5"
5890
5891CVE_STATUS[CVE-2023-52520] = "fixed-version: Fixed from version 6.6rc5"
5892
5893CVE_STATUS[CVE-2023-52522] = "fixed-version: Fixed from version 6.6rc5"
5894
5895CVE_STATUS[CVE-2023-52523] = "fixed-version: Fixed from version 6.6rc5"
5896
5897CVE_STATUS[CVE-2023-52524] = "fixed-version: Fixed from version 6.6rc5"
5898
5899CVE_STATUS[CVE-2023-52525] = "fixed-version: Fixed from version 6.6rc5"
5900
5901CVE_STATUS[CVE-2023-52526] = "fixed-version: Fixed from version 6.6rc5"
5902
5903CVE_STATUS[CVE-2023-52527] = "fixed-version: Fixed from version 6.6rc5"
5904
5905CVE_STATUS[CVE-2023-52528] = "fixed-version: Fixed from version 6.6rc5"
5906
5907CVE_STATUS[CVE-2023-52529] = "fixed-version: Fixed from version 6.6rc5"
5908
5909CVE_STATUS[CVE-2023-52530] = "fixed-version: Fixed from version 6.6rc5"
5910
5911CVE_STATUS[CVE-2023-52531] = "fixed-version: Fixed from version 6.6rc5"
5912
5913CVE_STATUS[CVE-2023-52532] = "fixed-version: Fixed from version 6.6rc5"
5914
5915CVE_STATUS[CVE-2023-52559] = "fixed-version: Fixed from version 6.6rc5"
5916
5917CVE_STATUS[CVE-2023-52560] = "fixed-version: Fixed from version 6.6rc4"
5918
5919CVE_STATUS[CVE-2023-52561] = "fixed-version: Fixed from version 6.6rc1"
5920
5921CVE_STATUS[CVE-2023-52562] = "fixed-version: Fixed from version 6.6rc4"
5922
5923CVE_STATUS[CVE-2023-52563] = "fixed-version: Fixed from version 6.6rc3"
5924
5925CVE_STATUS[CVE-2023-52564] = "fixed-version: Fixed from version 6.6rc4"
5926
5927CVE_STATUS[CVE-2023-52565] = "fixed-version: Fixed from version 6.6rc3"
5928
5929CVE_STATUS[CVE-2023-52566] = "fixed-version: Fixed from version 6.6rc4"
5930
5931CVE_STATUS[CVE-2023-52567] = "fixed-version: Fixed from version 6.6rc4"
5932
5933CVE_STATUS[CVE-2023-52568] = "fixed-version: Fixed from version 6.6rc4"
5934
5935CVE_STATUS[CVE-2023-52569] = "fixed-version: Fixed from version 6.6rc2"
5936
5937CVE_STATUS[CVE-2023-52570] = "fixed-version: Fixed from version 6.6rc4"
5938
5939CVE_STATUS[CVE-2023-52571] = "fixed-version: Fixed from version 6.6rc4"
5940
5941CVE_STATUS[CVE-2023-52572] = "fixed-version: Fixed from version 6.6rc3"
5942
5943CVE_STATUS[CVE-2023-52573] = "fixed-version: Fixed from version 6.6rc3"
5944
5945CVE_STATUS[CVE-2023-52574] = "fixed-version: Fixed from version 6.6rc3"
5946
5947CVE_STATUS[CVE-2023-52575] = "fixed-version: Fixed from version 6.6rc3"
5948
5949CVE_STATUS[CVE-2023-52576] = "fixed-version: Fixed from version 6.6rc3"
5950
5951CVE_STATUS[CVE-2023-52577] = "fixed-version: Fixed from version 6.6rc3"
5952
5953CVE_STATUS[CVE-2023-52578] = "fixed-version: Fixed from version 6.6rc3"
5954
5955CVE_STATUS[CVE-2023-52580] = "fixed-version: Fixed from version 6.6rc3"
5956
5957CVE_STATUS[CVE-2023-52581] = "fixed-version: Fixed from version 6.6rc3"
5958
5959CVE_STATUS[CVE-2023-52582] = "fixed-version: Fixed from version 6.6rc3"
5960
5961CVE_STATUS[CVE-2023-52583] = "cpe-stable-backport: Backported in 6.6.16"
5962
5963CVE_STATUS[CVE-2023-52584] = "cpe-stable-backport: Backported in 6.6.16"
5964
5965# CVE-2023-52585 needs backporting (fixed from 6.8rc1)
5966
5967# CVE-2023-52586 needs backporting (fixed from 6.8rc1)
5968
5969CVE_STATUS[CVE-2023-52587] = "cpe-stable-backport: Backported in 6.6.16"
5970
5971CVE_STATUS[CVE-2023-52588] = "cpe-stable-backport: Backported in 6.6.16"
5972
5973CVE_STATUS[CVE-2023-52589] = "cpe-stable-backport: Backported in 6.6.16"
5974
5975# CVE-2023-52590 needs backporting (fixed from 6.8rc1)
5976
5977CVE_STATUS[CVE-2023-52591] = "cpe-stable-backport: Backported in 6.6.16"
5978
5979CVE_STATUS[CVE-2023-52593] = "cpe-stable-backport: Backported in 6.6.16"
5980
5981CVE_STATUS[CVE-2023-52594] = "cpe-stable-backport: Backported in 6.6.16"
5982
5983CVE_STATUS[CVE-2023-52595] = "cpe-stable-backport: Backported in 6.6.16"
5984
5985CVE_STATUS[CVE-2023-52596] = "cpe-stable-backport: Backported in 6.6.16"
5986
5987CVE_STATUS[CVE-2023-52597] = "cpe-stable-backport: Backported in 6.6.16"
5988
5989CVE_STATUS[CVE-2023-52598] = "cpe-stable-backport: Backported in 6.6.16"
5990
5991CVE_STATUS[CVE-2023-52599] = "cpe-stable-backport: Backported in 6.6.16"
5992
5993CVE_STATUS[CVE-2023-52600] = "cpe-stable-backport: Backported in 6.6.16"
5994
5995CVE_STATUS[CVE-2023-52601] = "cpe-stable-backport: Backported in 6.6.16"
5996
5997CVE_STATUS[CVE-2023-52602] = "cpe-stable-backport: Backported in 6.6.16"
5998
5999CVE_STATUS[CVE-2023-52603] = "cpe-stable-backport: Backported in 6.6.16"
6000
6001CVE_STATUS[CVE-2023-52604] = "cpe-stable-backport: Backported in 6.6.16"
6002
6003CVE_STATUS[CVE-2023-52606] = "cpe-stable-backport: Backported in 6.6.16"
6004
6005CVE_STATUS[CVE-2023-52607] = "cpe-stable-backport: Backported in 6.6.16"
6006
6007CVE_STATUS[CVE-2023-52608] = "cpe-stable-backport: Backported in 6.6.15"
6008
6009CVE_STATUS[CVE-2023-52609] = "cpe-stable-backport: Backported in 6.6.14"
6010
6011CVE_STATUS[CVE-2023-52610] = "cpe-stable-backport: Backported in 6.6.14"
6012
6013CVE_STATUS[CVE-2023-52611] = "cpe-stable-backport: Backported in 6.6.14"
6014
6015CVE_STATUS[CVE-2023-52612] = "cpe-stable-backport: Backported in 6.6.14"
6016
6017CVE_STATUS[CVE-2023-52613] = "cpe-stable-backport: Backported in 6.6.14"
6018
6019CVE_STATUS[CVE-2023-52614] = "cpe-stable-backport: Backported in 6.6.15"
6020
6021CVE_STATUS[CVE-2023-52615] = "cpe-stable-backport: Backported in 6.6.15"
6022
6023CVE_STATUS[CVE-2023-52616] = "cpe-stable-backport: Backported in 6.6.15"
6024
6025CVE_STATUS[CVE-2023-52617] = "cpe-stable-backport: Backported in 6.6.16"
6026
6027CVE_STATUS[CVE-2023-52618] = "cpe-stable-backport: Backported in 6.6.16"
6028
6029CVE_STATUS[CVE-2023-52619] = "cpe-stable-backport: Backported in 6.6.16"
6030
6031CVE_STATUS[CVE-2023-52620] = "fixed-version: Fixed from version 6.4"
6032
6033CVE_STATUS[CVE-2023-52621] = "cpe-stable-backport: Backported in 6.6.16"
6034
6035CVE_STATUS[CVE-2023-52622] = "cpe-stable-backport: Backported in 6.6.16"
6036
6037CVE_STATUS[CVE-2023-52623] = "cpe-stable-backport: Backported in 6.6.16"
6038
6039# CVE-2023-52624 needs backporting (fixed from 6.8rc1)
6040
6041# CVE-2023-52625 needs backporting (fixed from 6.8rc1)
6042
6043CVE_STATUS[CVE-2023-52626] = "fixed-version: only affects 6.7rc2 onwards"
6044
6045CVE_STATUS[CVE-2023-52627] = "cpe-stable-backport: Backported in 6.6.15"
6046
6047CVE_STATUS[CVE-2023-52628] = "fixed-version: Fixed from version 6.6rc1"
6048
6049CVE_STATUS[CVE-2023-52629] = "fixed-version: Fixed from version 6.6rc1"
6050
6051CVE_STATUS[CVE-2023-52630] = "cpe-stable-backport: Backported in 6.6.17"
6052
6053CVE_STATUS[CVE-2023-52631] = "cpe-stable-backport: Backported in 6.6.17"
6054
6055CVE_STATUS[CVE-2023-52632] = "cpe-stable-backport: Backported in 6.6.16"
6056
6057CVE_STATUS[CVE-2023-52633] = "cpe-stable-backport: Backported in 6.6.16"
6058
6059# CVE-2023-52634 needs backporting (fixed from 6.8rc1)
6060
6061CVE_STATUS[CVE-2023-52635] = "cpe-stable-backport: Backported in 6.6.16"
6062
6063CVE_STATUS[CVE-2023-52636] = "cpe-stable-backport: Backported in 6.6.17"
6064
6065CVE_STATUS[CVE-2023-52637] = "cpe-stable-backport: Backported in 6.6.18"
6066
6067CVE_STATUS[CVE-2023-52638] = "cpe-stable-backport: Backported in 6.6.18"
6068
6069CVE_STATUS[CVE-2023-52639] = "cpe-stable-backport: Backported in 6.6.22"
6070
6071CVE_STATUS[CVE-2023-52640] = "cpe-stable-backport: Backported in 6.6.19"
6072
6073CVE_STATUS[CVE-2023-52641] = "cpe-stable-backport: Backported in 6.6.19"
6074
5211CVE_STATUS[CVE-2023-5345] = "fixed-version: Fixed from version 6.6rc4" 6075CVE_STATUS[CVE-2023-5345] = "fixed-version: Fixed from version 6.6rc4"
5212 6076
5213CVE_STATUS[CVE-2023-5633] = "fixed-version: Fixed from version 6.6rc6" 6077CVE_STATUS[CVE-2023-5633] = "fixed-version: Fixed from version 6.6rc6"
@@ -5232,15 +6096,15 @@ CVE_STATUS[CVE-2023-6200] = "cpe-stable-backport: Backported in 6.6.9"
5232 6096
5233# CVE-2023-6240 has no known resolution 6097# CVE-2023-6240 has no known resolution
5234 6098
5235# CVE-2023-6270 has no known resolution 6099CVE_STATUS[CVE-2023-6270] = "cpe-stable-backport: Backported in 6.6.23"
5236 6100
5237# CVE-2023-6356 has no known resolution 6101CVE_STATUS[CVE-2023-6356] = "cpe-stable-backport: Backported in 6.6.14"
5238 6102
5239CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.6.7" 6103CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.6.7"
5240 6104
5241# CVE-2023-6535 has no known resolution 6105# CVE-2023-6535 has no known resolution
5242 6106
5243# CVE-2023-6536 has no known resolution 6107CVE_STATUS[CVE-2023-6536] = "cpe-stable-backport: Backported in 6.6.14"
5244 6108
5245CVE_STATUS[CVE-2023-6546] = "fixed-version: Fixed from version 6.5rc7" 6109CVE_STATUS[CVE-2023-6546] = "fixed-version: Fixed from version 6.5rc7"
5246 6110
@@ -5262,7 +6126,7 @@ CVE_STATUS[CVE-2023-6931] = "cpe-stable-backport: Backported in 6.6.7"
5262 6126
5263CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.6.5" 6127CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.6.5"
5264 6128
5265# CVE-2023-7042 has no known resolution 6129CVE_STATUS[CVE-2023-7042] = "cpe-stable-backport: Backported in 6.6.23"
5266 6130
5267CVE_STATUS[CVE-2023-7192] = "fixed-version: Fixed from version 6.3rc1" 6131CVE_STATUS[CVE-2023-7192] = "fixed-version: Fixed from version 6.3rc1"
5268 6132
@@ -5292,7 +6156,7 @@ CVE_STATUS[CVE-2024-0646] = "cpe-stable-backport: Backported in 6.6.7"
5292 6156
5293CVE_STATUS[CVE-2024-0775] = "fixed-version: Fixed from version 6.4rc2" 6157CVE_STATUS[CVE-2024-0775] = "fixed-version: Fixed from version 6.4rc2"
5294 6158
5295# CVE-2024-0841 has no known resolution 6159CVE_STATUS[CVE-2024-0841] = "cpe-stable-backport: Backported in 6.6.18"
5296 6160
5297CVE_STATUS[CVE-2024-1085] = "cpe-stable-backport: Backported in 6.6.14" 6161CVE_STATUS[CVE-2024-1085] = "cpe-stable-backport: Backported in 6.6.14"
5298 6162
@@ -5304,15 +6168,17 @@ CVE_STATUS[CVE-2024-1312] = "fixed-version: Fixed from version 6.5rc4"
5304 6168
5305# CVE-2024-21803 has no known resolution 6169# CVE-2024-21803 has no known resolution
5306 6170
5307# CVE-2024-22099 has no known resolution 6171# CVE-2024-2193 has no known resolution
6172
6173CVE_STATUS[CVE-2024-22099] = "cpe-stable-backport: Backported in 6.6.23"
5308 6174
5309# CVE-2024-22386 has no known resolution 6175# CVE-2024-22386 has no known resolution
5310 6176
5311CVE_STATUS[CVE-2024-22705] = "cpe-stable-backport: Backported in 6.6.10" 6177CVE_STATUS[CVE-2024-22705] = "cpe-stable-backport: Backported in 6.6.10"
5312 6178
5313# CVE-2024-23196 has no known resolution 6179CVE_STATUS[CVE-2024-23196] = "fixed-version: Fixed from version 6.5rc1"
5314 6180
5315# CVE-2024-23307 has no known resolution 6181CVE_STATUS[CVE-2024-23307] = "cpe-stable-backport: Backported in 6.6.24"
5316 6182
5317# CVE-2024-23848 has no known resolution 6183# CVE-2024-23848 has no known resolution
5318 6184
@@ -5332,7 +6198,7 @@ CVE_STATUS[CVE-2024-24855] = "fixed-version: Fixed from version 6.5rc2"
5332 6198
5333CVE_STATUS[CVE-2024-24860] = "cpe-stable-backport: Backported in 6.6.14" 6199CVE_STATUS[CVE-2024-24860] = "cpe-stable-backport: Backported in 6.6.14"
5334 6200
5335# CVE-2024-24861 has no known resolution 6201CVE_STATUS[CVE-2024-24861] = "cpe-stable-backport: Backported in 6.6.24"
5336 6202
5337# CVE-2024-24864 has no known resolution 6203# CVE-2024-24864 has no known resolution
5338 6204
@@ -5382,3 +6248,413 @@ CVE_STATUS[CVE-2024-26598] = "cpe-stable-backport: Backported in 6.6.14"
5382 6248
5383CVE_STATUS[CVE-2024-26599] = "cpe-stable-backport: Backported in 6.6.14" 6249CVE_STATUS[CVE-2024-26599] = "cpe-stable-backport: Backported in 6.6.14"
5384 6250
6251CVE_STATUS[CVE-2024-26600] = "cpe-stable-backport: Backported in 6.6.17"
6252
6253CVE_STATUS[CVE-2024-26601] = "cpe-stable-backport: Backported in 6.6.17"
6254
6255CVE_STATUS[CVE-2024-26602] = "cpe-stable-backport: Backported in 6.6.18"
6256
6257CVE_STATUS[CVE-2024-26603] = "cpe-stable-backport: Backported in 6.6.18"
6258
6259CVE_STATUS[CVE-2024-26604] = "cpe-stable-backport: Backported in 6.6.18"
6260
6261CVE_STATUS[CVE-2024-26605] = "fixed-version: only affects 6.7 onwards"
6262
6263CVE_STATUS[CVE-2024-26606] = "cpe-stable-backport: Backported in 6.6.18"
6264
6265CVE_STATUS[CVE-2024-26607] = "cpe-stable-backport: Backported in 6.6.15"
6266
6267CVE_STATUS[CVE-2024-26608] = "cpe-stable-backport: Backported in 6.6.15"
6268
6269CVE_STATUS[CVE-2024-26610] = "cpe-stable-backport: Backported in 6.6.15"
6270
6271CVE_STATUS[CVE-2024-26611] = "cpe-stable-backport: Backported in 6.6.15"
6272
6273CVE_STATUS[CVE-2024-26612] = "cpe-stable-backport: Backported in 6.6.15"
6274
6275CVE_STATUS[CVE-2024-26614] = "cpe-stable-backport: Backported in 6.6.15"
6276
6277CVE_STATUS[CVE-2024-26615] = "cpe-stable-backport: Backported in 6.6.15"
6278
6279CVE_STATUS[CVE-2024-26616] = "cpe-stable-backport: Backported in 6.6.15"
6280
6281CVE_STATUS[CVE-2024-26617] = "fixed-version: only affects 6.7rc1 onwards"
6282
6283CVE_STATUS[CVE-2024-26618] = "cpe-stable-backport: Backported in 6.6.15"
6284
6285CVE_STATUS[CVE-2024-26619] = "fixed-version: only affects 6.7rc5 onwards"
6286
6287CVE_STATUS[CVE-2024-26620] = "cpe-stable-backport: Backported in 6.6.15"
6288
6289CVE_STATUS[CVE-2024-26621] = "fixed-version: only affects 6.7 onwards"
6290
6291CVE_STATUS[CVE-2024-26622] = "cpe-stable-backport: Backported in 6.6.21"
6292
6293CVE_STATUS[CVE-2024-26623] = "cpe-stable-backport: Backported in 6.6.16"
6294
6295CVE_STATUS[CVE-2024-26625] = "cpe-stable-backport: Backported in 6.6.16"
6296
6297CVE_STATUS[CVE-2024-26626] = "fixed-version: only affects 6.8rc1 onwards"
6298
6299CVE_STATUS[CVE-2024-26627] = "cpe-stable-backport: Backported in 6.6.16"
6300
6301CVE_STATUS[CVE-2024-26629] = "cpe-stable-backport: Backported in 6.6.15"
6302
6303CVE_STATUS[CVE-2024-26630] = "cpe-stable-backport: Backported in 6.6.21"
6304
6305CVE_STATUS[CVE-2024-26631] = "cpe-stable-backport: Backported in 6.6.14"
6306
6307CVE_STATUS[CVE-2024-26632] = "cpe-stable-backport: Backported in 6.6.14"
6308
6309CVE_STATUS[CVE-2024-26633] = "cpe-stable-backport: Backported in 6.6.14"
6310
6311CVE_STATUS[CVE-2024-26634] = "cpe-stable-backport: Backported in 6.6.15"
6312
6313CVE_STATUS[CVE-2024-26635] = "cpe-stable-backport: Backported in 6.6.15"
6314
6315CVE_STATUS[CVE-2024-26636] = "cpe-stable-backport: Backported in 6.6.15"
6316
6317CVE_STATUS[CVE-2024-26637] = "fixed-version: only affects 6.7 onwards"
6318
6319CVE_STATUS[CVE-2024-26638] = "cpe-stable-backport: Backported in 6.6.15"
6320
6321CVE_STATUS[CVE-2024-26639] = "fixed-version: only affects 6.8rc1 onwards"
6322
6323CVE_STATUS[CVE-2024-26640] = "cpe-stable-backport: Backported in 6.6.16"
6324
6325CVE_STATUS[CVE-2024-26641] = "cpe-stable-backport: Backported in 6.6.16"
6326
6327CVE_STATUS[CVE-2024-26642] = "cpe-stable-backport: Backported in 6.6.24"
6328
6329CVE_STATUS[CVE-2024-26643] = "cpe-stable-backport: Backported in 6.6.24"
6330
6331CVE_STATUS[CVE-2024-26644] = "cpe-stable-backport: Backported in 6.6.15"
6332
6333CVE_STATUS[CVE-2024-26645] = "cpe-stable-backport: Backported in 6.6.15"
6334
6335CVE_STATUS[CVE-2024-26646] = "cpe-stable-backport: Backported in 6.6.15"
6336
6337CVE_STATUS[CVE-2024-26647] = "cpe-stable-backport: Backported in 6.6.15"
6338
6339CVE_STATUS[CVE-2024-26648] = "cpe-stable-backport: Backported in 6.6.15"
6340
6341CVE_STATUS[CVE-2024-26649] = "cpe-stable-backport: Backported in 6.6.15"
6342
6343CVE_STATUS[CVE-2024-26650] = "cpe-stable-backport: Backported in 6.6.15"
6344
6345CVE_STATUS[CVE-2024-26651] = "cpe-stable-backport: Backported in 6.6.23"
6346
6347CVE_STATUS[CVE-2024-26652] = "cpe-stable-backport: Backported in 6.6.22"
6348
6349CVE_STATUS[CVE-2024-26653] = "fixed-version: only affects 6.7rc1 onwards"
6350
6351CVE_STATUS[CVE-2024-26654] = "cpe-stable-backport: Backported in 6.6.24"
6352
6353# CVE-2024-26655 needs backporting (fixed from 6.9rc2)
6354
6355CVE_STATUS[CVE-2024-26656] = "cpe-stable-backport: Backported in 6.6.24"
6356
6357CVE_STATUS[CVE-2024-26657] = "fixed-version: only affects 6.7rc1 onwards"
6358
6359# CVE-2024-26658 needs backporting (fixed from 6.8rc1)
6360
6361CVE_STATUS[CVE-2024-26659] = "cpe-stable-backport: Backported in 6.6.17"
6362
6363CVE_STATUS[CVE-2024-26660] = "cpe-stable-backport: Backported in 6.6.17"
6364
6365CVE_STATUS[CVE-2024-26661] = "cpe-stable-backport: Backported in 6.6.17"
6366
6367CVE_STATUS[CVE-2024-26662] = "cpe-stable-backport: Backported in 6.6.17"
6368
6369CVE_STATUS[CVE-2024-26663] = "cpe-stable-backport: Backported in 6.6.17"
6370
6371CVE_STATUS[CVE-2024-26664] = "cpe-stable-backport: Backported in 6.6.17"
6372
6373CVE_STATUS[CVE-2024-26665] = "cpe-stable-backport: Backported in 6.6.17"
6374
6375CVE_STATUS[CVE-2024-26666] = "cpe-stable-backport: Backported in 6.6.17"
6376
6377CVE_STATUS[CVE-2024-26667] = "cpe-stable-backport: Backported in 6.6.17"
6378
6379CVE_STATUS[CVE-2024-26668] = "cpe-stable-backport: Backported in 6.6.15"
6380
6381CVE_STATUS[CVE-2024-26669] = "cpe-stable-backport: Backported in 6.6.15"
6382
6383CVE_STATUS[CVE-2024-26670] = "cpe-stable-backport: Backported in 6.6.15"
6384
6385CVE_STATUS[CVE-2024-26671] = "cpe-stable-backport: Backported in 6.6.16"
6386
6387# CVE-2024-26672 needs backporting (fixed from 6.8rc1)
6388
6389CVE_STATUS[CVE-2024-26673] = "cpe-stable-backport: Backported in 6.6.16"
6390
6391CVE_STATUS[CVE-2024-26674] = "cpe-stable-backport: Backported in 6.6.17"
6392
6393CVE_STATUS[CVE-2024-26675] = "cpe-stable-backport: Backported in 6.6.17"
6394
6395CVE_STATUS[CVE-2024-26676] = "cpe-stable-backport: Backported in 6.6.17"
6396
6397CVE_STATUS[CVE-2024-26677] = "cpe-stable-backport: Backported in 6.6.17"
6398
6399CVE_STATUS[CVE-2024-26678] = "fixed-version: only affects 6.7rc1 onwards"
6400
6401CVE_STATUS[CVE-2024-26679] = "cpe-stable-backport: Backported in 6.6.17"
6402
6403CVE_STATUS[CVE-2024-26680] = "cpe-stable-backport: Backported in 6.6.17"
6404
6405CVE_STATUS[CVE-2024-26681] = "cpe-stable-backport: Backported in 6.6.17"
6406
6407CVE_STATUS[CVE-2024-26682] = "fixed-version: only affects 6.7rc1 onwards"
6408
6409CVE_STATUS[CVE-2024-26683] = "fixed-version: only affects 6.7rc1 onwards"
6410
6411CVE_STATUS[CVE-2024-26684] = "cpe-stable-backport: Backported in 6.6.17"
6412
6413CVE_STATUS[CVE-2024-26685] = "cpe-stable-backport: Backported in 6.6.18"
6414
6415# CVE-2024-26686 needs backporting (fixed from 6.8rc4)
6416
6417CVE_STATUS[CVE-2024-26687] = "cpe-stable-backport: Backported in 6.6.19"
6418
6419CVE_STATUS[CVE-2024-26688] = "cpe-stable-backport: Backported in 6.6.18"
6420
6421CVE_STATUS[CVE-2024-26689] = "cpe-stable-backport: Backported in 6.6.18"
6422
6423CVE_STATUS[CVE-2024-26690] = "cpe-stable-backport: Backported in 6.6.18"
6424
6425CVE_STATUS[CVE-2024-26691] = "cpe-stable-backport: Backported in 6.6.18"
6426
6427CVE_STATUS[CVE-2024-26692] = "cpe-stable-backport: Backported in 6.6.18"
6428
6429CVE_STATUS[CVE-2024-26693] = "cpe-stable-backport: Backported in 6.6.18"
6430
6431CVE_STATUS[CVE-2024-26694] = "cpe-stable-backport: Backported in 6.6.18"
6432
6433CVE_STATUS[CVE-2024-26695] = "cpe-stable-backport: Backported in 6.6.18"
6434
6435CVE_STATUS[CVE-2024-26696] = "cpe-stable-backport: Backported in 6.6.18"
6436
6437CVE_STATUS[CVE-2024-26697] = "cpe-stable-backport: Backported in 6.6.18"
6438
6439CVE_STATUS[CVE-2024-26698] = "cpe-stable-backport: Backported in 6.6.18"
6440
6441# CVE-2024-26699 needs backporting (fixed from 6.8rc5)
6442
6443CVE_STATUS[CVE-2024-26700] = "cpe-stable-backport: Backported in 6.6.18"
6444
6445CVE_STATUS[CVE-2024-26702] = "cpe-stable-backport: Backported in 6.6.18"
6446
6447CVE_STATUS[CVE-2024-26703] = "cpe-stable-backport: Backported in 6.6.18"
6448
6449CVE_STATUS[CVE-2024-26704] = "cpe-stable-backport: Backported in 6.6.18"
6450
6451CVE_STATUS[CVE-2024-26705] = "cpe-stable-backport: Backported in 6.6.18"
6452
6453CVE_STATUS[CVE-2024-26706] = "cpe-stable-backport: Backported in 6.6.18"
6454
6455CVE_STATUS[CVE-2024-26707] = "cpe-stable-backport: Backported in 6.6.18"
6456
6457CVE_STATUS[CVE-2024-26708] = "cpe-stable-backport: Backported in 6.6.18"
6458
6459CVE_STATUS[CVE-2024-26709] = "fixed-version: only affects 6.7rc1 onwards"
6460
6461CVE_STATUS[CVE-2024-26710] = "fixed-version: only affects 6.8rc1 onwards"
6462
6463CVE_STATUS[CVE-2024-26711] = "cpe-stable-backport: Backported in 6.6.18"
6464
6465CVE_STATUS[CVE-2024-26712] = "cpe-stable-backport: Backported in 6.6.18"
6466
6467CVE_STATUS[CVE-2024-26713] = "cpe-stable-backport: Backported in 6.6.18"
6468
6469CVE_STATUS[CVE-2024-26714] = "cpe-stable-backport: Backported in 6.6.18"
6470
6471CVE_STATUS[CVE-2024-26715] = "cpe-stable-backport: Backported in 6.6.18"
6472
6473CVE_STATUS[CVE-2024-26716] = "cpe-stable-backport: Backported in 6.6.18"
6474
6475CVE_STATUS[CVE-2024-26717] = "cpe-stable-backport: Backported in 6.6.18"
6476
6477CVE_STATUS[CVE-2024-26718] = "cpe-stable-backport: Backported in 6.6.18"
6478
6479CVE_STATUS[CVE-2024-26719] = "cpe-stable-backport: Backported in 6.6.18"
6480
6481CVE_STATUS[CVE-2024-26720] = "cpe-stable-backport: Backported in 6.6.18"
6482
6483CVE_STATUS[CVE-2024-26721] = "fixed-version: only affects 6.7rc1 onwards"
6484
6485CVE_STATUS[CVE-2024-26722] = "fixed-version: only affects 6.7rc5 onwards"
6486
6487CVE_STATUS[CVE-2024-26723] = "cpe-stable-backport: Backported in 6.6.18"
6488
6489CVE_STATUS[CVE-2024-26724] = "fixed-version: only affects 6.7rc1 onwards"
6490
6491CVE_STATUS[CVE-2024-26725] = "fixed-version: only affects 6.7rc1 onwards"
6492
6493CVE_STATUS[CVE-2024-26726] = "cpe-stable-backport: Backported in 6.6.18"
6494
6495CVE_STATUS[CVE-2024-26727] = "cpe-stable-backport: Backported in 6.6.18"
6496
6497CVE_STATUS[CVE-2024-26728] = "fixed-version: only affects 6.7rc1 onwards"
6498
6499CVE_STATUS[CVE-2024-26729] = "fixed-version: only affects 6.7rc1 onwards"
6500
6501CVE_STATUS[CVE-2024-26730] = "cpe-stable-backport: Backported in 6.6.19"
6502
6503CVE_STATUS[CVE-2024-26731] = "cpe-stable-backport: Backported in 6.6.19"
6504
6505CVE_STATUS[CVE-2024-26732] = "fixed-version: only affects 6.7rc1 onwards"
6506
6507CVE_STATUS[CVE-2024-26733] = "cpe-stable-backport: Backported in 6.6.19"
6508
6509CVE_STATUS[CVE-2024-26734] = "cpe-stable-backport: Backported in 6.6.19"
6510
6511CVE_STATUS[CVE-2024-26735] = "cpe-stable-backport: Backported in 6.6.19"
6512
6513CVE_STATUS[CVE-2024-26736] = "cpe-stable-backport: Backported in 6.6.19"
6514
6515CVE_STATUS[CVE-2024-26737] = "cpe-stable-backport: Backported in 6.6.19"
6516
6517CVE_STATUS[CVE-2024-26738] = "cpe-stable-backport: Backported in 6.6.19"
6518
6519CVE_STATUS[CVE-2024-26739] = "cpe-stable-backport: Backported in 6.6.19"
6520
6521CVE_STATUS[CVE-2024-26740] = "cpe-stable-backport: Backported in 6.6.19"
6522
6523CVE_STATUS[CVE-2024-26741] = "cpe-stable-backport: Backported in 6.6.19"
6524
6525CVE_STATUS[CVE-2024-26742] = "cpe-stable-backport: Backported in 6.6.19"
6526
6527CVE_STATUS[CVE-2024-26743] = "cpe-stable-backport: Backported in 6.6.19"
6528
6529CVE_STATUS[CVE-2024-26744] = "cpe-stable-backport: Backported in 6.6.19"
6530
6531CVE_STATUS[CVE-2024-26745] = "cpe-stable-backport: Backported in 6.6.21"
6532
6533CVE_STATUS[CVE-2024-26746] = "cpe-stable-backport: Backported in 6.6.21"
6534
6535CVE_STATUS[CVE-2024-26747] = "cpe-stable-backport: Backported in 6.6.19"
6536
6537CVE_STATUS[CVE-2024-26748] = "cpe-stable-backport: Backported in 6.6.19"
6538
6539CVE_STATUS[CVE-2024-26749] = "cpe-stable-backport: Backported in 6.6.19"
6540
6541CVE_STATUS[CVE-2024-26750] = "fixed-version: only affects 6.8rc5 onwards"
6542
6543CVE_STATUS[CVE-2024-26751] = "cpe-stable-backport: Backported in 6.6.19"
6544
6545CVE_STATUS[CVE-2024-26752] = "cpe-stable-backport: Backported in 6.6.19"
6546
6547CVE_STATUS[CVE-2024-26753] = "cpe-stable-backport: Backported in 6.6.19"
6548
6549CVE_STATUS[CVE-2024-26754] = "cpe-stable-backport: Backported in 6.6.19"
6550
6551CVE_STATUS[CVE-2024-26755] = "fixed-version: only affects 6.7rc1 onwards"
6552
6553# CVE-2024-26756 needs backporting (fixed from 6.8rc6)
6554
6555# CVE-2024-26757 needs backporting (fixed from 6.8rc6)
6556
6557# CVE-2024-26758 needs backporting (fixed from 6.8rc6)
6558
6559CVE_STATUS[CVE-2024-26759] = "cpe-stable-backport: Backported in 6.6.19"
6560
6561CVE_STATUS[CVE-2024-26760] = "cpe-stable-backport: Backported in 6.6.19"
6562
6563CVE_STATUS[CVE-2024-26761] = "cpe-stable-backport: Backported in 6.6.19"
6564
6565CVE_STATUS[CVE-2024-26762] = "fixed-version: only affects 6.7rc1 onwards"
6566
6567CVE_STATUS[CVE-2024-26763] = "cpe-stable-backport: Backported in 6.6.19"
6568
6569CVE_STATUS[CVE-2024-26764] = "cpe-stable-backport: Backported in 6.6.19"
6570
6571CVE_STATUS[CVE-2024-26765] = "cpe-stable-backport: Backported in 6.6.19"
6572
6573CVE_STATUS[CVE-2024-26766] = "cpe-stable-backport: Backported in 6.6.19"
6574
6575CVE_STATUS[CVE-2024-26767] = "cpe-stable-backport: Backported in 6.6.19"
6576
6577CVE_STATUS[CVE-2024-26768] = "cpe-stable-backport: Backported in 6.6.19"
6578
6579CVE_STATUS[CVE-2024-26769] = "cpe-stable-backport: Backported in 6.6.19"
6580
6581CVE_STATUS[CVE-2024-26770] = "cpe-stable-backport: Backported in 6.6.19"
6582
6583CVE_STATUS[CVE-2024-26771] = "cpe-stable-backport: Backported in 6.6.19"
6584
6585CVE_STATUS[CVE-2024-26772] = "cpe-stable-backport: Backported in 6.6.19"
6586
6587CVE_STATUS[CVE-2024-26773] = "cpe-stable-backport: Backported in 6.6.19"
6588
6589CVE_STATUS[CVE-2024-26774] = "cpe-stable-backport: Backported in 6.6.19"
6590
6591CVE_STATUS[CVE-2024-26775] = "cpe-stable-backport: Backported in 6.6.19"
6592
6593CVE_STATUS[CVE-2024-26776] = "cpe-stable-backport: Backported in 6.6.19"
6594
6595CVE_STATUS[CVE-2024-26777] = "cpe-stable-backport: Backported in 6.6.19"
6596
6597CVE_STATUS[CVE-2024-26778] = "cpe-stable-backport: Backported in 6.6.19"
6598
6599CVE_STATUS[CVE-2024-26779] = "cpe-stable-backport: Backported in 6.6.19"
6600
6601CVE_STATUS[CVE-2024-26780] = "fixed-version: only affects 6.8rc4 onwards"
6602
6603CVE_STATUS[CVE-2024-26781] = "fixed-version: only affects 6.8rc6 onwards"
6604
6605CVE_STATUS[CVE-2024-26782] = "cpe-stable-backport: Backported in 6.6.21"
6606
6607CVE_STATUS[CVE-2024-26783] = "cpe-stable-backport: Backported in 6.6.22"
6608
6609# CVE-2024-26784 needs backporting (fixed from 6.8rc7)
6610
6611# CVE-2024-26785 needs backporting (fixed from 6.8rc7)
6612
6613CVE_STATUS[CVE-2024-26786] = "cpe-stable-backport: Backported in 6.6.21"
6614
6615CVE_STATUS[CVE-2024-26787] = "cpe-stable-backport: Backported in 6.6.21"
6616
6617CVE_STATUS[CVE-2024-26788] = "cpe-stable-backport: Backported in 6.6.21"
6618
6619CVE_STATUS[CVE-2024-26789] = "cpe-stable-backport: Backported in 6.6.21"
6620
6621CVE_STATUS[CVE-2024-26790] = "cpe-stable-backport: Backported in 6.6.21"
6622
6623CVE_STATUS[CVE-2024-26791] = "cpe-stable-backport: Backported in 6.6.21"
6624
6625CVE_STATUS[CVE-2024-26792] = "fixed-version: only affects 6.8rc4 onwards"
6626
6627CVE_STATUS[CVE-2024-26793] = "cpe-stable-backport: Backported in 6.6.21"
6628
6629CVE_STATUS[CVE-2024-26794] = "fixed-version: only affects 6.8rc6 onwards"
6630
6631CVE_STATUS[CVE-2024-26795] = "cpe-stable-backport: Backported in 6.6.21"
6632
6633CVE_STATUS[CVE-2024-26796] = "cpe-stable-backport: Backported in 6.6.21"
6634
6635# CVE-2024-26797 needs backporting (fixed from 6.8rc7)
6636
6637CVE_STATUS[CVE-2024-26798] = "cpe-stable-backport: Backported in 6.6.21"
6638
6639CVE_STATUS[CVE-2024-26799] = "cpe-stable-backport: Backported in 6.6.21"
6640
6641CVE_STATUS[CVE-2024-26800] = "fixed-version: only affects 6.8rc5 onwards"
6642
6643CVE_STATUS[CVE-2024-26801] = "cpe-stable-backport: Backported in 6.6.21"
6644
6645CVE_STATUS[CVE-2024-26802] = "cpe-stable-backport: Backported in 6.6.21"
6646
6647CVE_STATUS[CVE-2024-26803] = "cpe-stable-backport: Backported in 6.6.21"
6648
6649CVE_STATUS[CVE-2024-26804] = "cpe-stable-backport: Backported in 6.6.21"
6650
6651CVE_STATUS[CVE-2024-26805] = "cpe-stable-backport: Backported in 6.6.21"
6652
6653# CVE-2024-26806 needs backporting (fixed from 6.8rc7)
6654
6655CVE_STATUS[CVE-2024-26807] = "cpe-stable-backport: Backported in 6.6.21"
6656
6657CVE_STATUS[CVE-2024-26808] = "cpe-stable-backport: Backported in 6.6.15"
6658
6659CVE_STATUS[CVE-2024-26809] = "cpe-stable-backport: Backported in 6.6.23"
6660
diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb
index 2396f46202..3e9a563cad 100644
--- a/meta/recipes-kernel/linux/linux-dummy.bb
+++ b/meta/recipes-kernel/linux/linux-dummy.bb
@@ -30,7 +30,9 @@ COMPATIBLE_HOST = ".*-linux"
30 30
31 31
32SRC_URI = "file://COPYING.GPL" 32SRC_URI = "file://COPYING.GPL"
33S = "${WORKDIR}" 33
34S = "${WORKDIR}/sources"
35UNPACKDIR = "${S}"
34 36
35do_configure() { 37do_configure() {
36 : 38 :
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index bd3e5a9406..0097fec7b2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -14,7 +14,7 @@ require recipes-kernel/linux/linux-yocto.inc
14# provide this .inc to set specific revisions 14# provide this .inc to set specific revisions
15include recipes-kernel/linux/linux-yocto-dev-revisions.inc 15include recipes-kernel/linux/linux-yocto-dev-revisions.inc
16 16
17KBRANCH = "v6.8/standard/base" 17KBRANCH = "v6.10/standard/base"
18KMETA = "kernel-meta" 18KMETA = "kernel-meta"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https \
@@ -28,17 +28,12 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
28SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' 28SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
29SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' 29SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
30 30
31LINUX_VERSION ?= "6.8" 31LINUX_VERSION ?= "6.10"
32LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" 32LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
33PV = "${LINUX_VERSION}+git" 33PV = "${LINUX_VERSION}+git"
34 34
35LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 35LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
36 36
37DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
38DEPENDS += "${@bb.utils.contains('ARCH', 'powerpc', 'elfutils-native', '', d)}"
39DEPENDS += "openssl-native util-linux-native"
40DEPENDS += "gmp-native libmpc-native"
41
42# yaml and dtschema are required for 5.16+ device tree validation, libyaml is checked 37# yaml and dtschema are required for 5.16+ device tree validation, libyaml is checked
43# via pkgconfig, so must always be present, but we can wrap the others to make them 38# via pkgconfig, so must always be present, but we can wrap the others to make them
44# conditional 39# conditional
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index eb5e1da33c..f8d47a9dba 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,13 +14,13 @@ python () {
14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
15} 15}
16 16
17SRCREV_machine ?= "1c3234ba160c59eb50739f23591a87daf09fac35" 17SRCREV_machine ?= "59b2635b04e2ef8162e52f82e848b81073cea708"
18SRCREV_meta ?= "a1711f65dcd5f88160d30447dcab3b88a1562690" 18SRCREV_meta ?= "66bebb6789d02e775d4c93d7ca4bf79c2ead4b28"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
22 22
23LINUX_VERSION ?= "6.6.22" 23LINUX_VERSION ?= "6.6.32"
24 24
25LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 25LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
26 26
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index 7d6197db5e..7378a37521 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
8# CVE exclusions 8# CVE exclusions
9include recipes-kernel/linux/cve-exclusion_6.6.inc 9include recipes-kernel/linux/cve-exclusion_6.6.inc
10 10
11LINUX_VERSION ?= "6.6.22" 11LINUX_VERSION ?= "6.6.32"
12LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 12LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
13 13
14DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" 14DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 20SRCREV_machine ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
21SRCREV_meta ?= "a1711f65dcd5f88160d30447dcab3b88a1562690" 21SRCREV_meta ?= "66bebb6789d02e775d4c93d7ca4bf79c2ead4b28"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index 01cb6a860c..fdb7702594 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base"
18KBRANCH:qemuloongarch64 ?= "v6.6/standard/base" 18KBRANCH:qemuloongarch64 ?= "v6.6/standard/base"
19KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64" 19KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
20 20
21SRCREV_machine:qemuarm ?= "0873b6f725956acf2e6d57d720edd8a2177e18ce" 21SRCREV_machine:qemuarm ?= "6e4ec0ec5052e3a107ec7e5977ea9282d3642ea7"
22SRCREV_machine:qemuarm64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 22SRCREV_machine:qemuarm64 ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
23SRCREV_machine:qemuloongarch64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 23SRCREV_machine:qemuloongarch64 ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
24SRCREV_machine:qemumips ?= "6a81581711b1cb35046c637ecfbb6b17a8abbcb5" 24SRCREV_machine:qemumips ?= "cab976b23497344b74b7e4cbcb5df732f8630150"
25SRCREV_machine:qemuppc ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 25SRCREV_machine:qemuppc ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
26SRCREV_machine:qemuriscv64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 26SRCREV_machine:qemuriscv64 ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
27SRCREV_machine:qemuriscv32 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 27SRCREV_machine:qemuriscv32 ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
28SRCREV_machine:qemux86 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 28SRCREV_machine:qemux86 ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
29SRCREV_machine:qemux86-64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 29SRCREV_machine:qemux86-64 ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
30SRCREV_machine:qemumips64 ?= "6cb075269e42d03857c95ebc8b5f8e154f155add" 30SRCREV_machine:qemumips64 ?= "aa0c0197b3a0628992e959708a2ad015603e93ad"
31SRCREV_machine ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" 31SRCREV_machine ?= "9576b5b9f8e3c78e6c315f475def18e5c29e475a"
32SRCREV_meta ?= "a1711f65dcd5f88160d30447dcab3b88a1562690" 32SRCREV_meta ?= "66bebb6789d02e775d4c93d7ca4bf79c2ead4b28"
33 33
34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
35# get the <version>/base branch, which is pure upstream -stable, and the same 35# get the <version>/base branch, which is pure upstream -stable, and the same
36# meta SRCREV as the linux-yocto-standard builds. Select your version using the 36# meta SRCREV as the linux-yocto-standard builds. Select your version using the
37# normal PREFERRED_VERSION settings. 37# normal PREFERRED_VERSION settings.
38BBCLASSEXTEND = "devupstream:target" 38BBCLASSEXTEND = "devupstream:target"
39SRCREV_machine:class-devupstream ?= "6a646d9fe8a2bf8d25817ceddf96dfc5eb5446db" 39SRCREV_machine:class-devupstream ?= "91de249b6804473d49984030836381c3b9b3cfb0"
40PN:class-devupstream = "linux-yocto-upstream" 40PN:class-devupstream = "linux-yocto-upstream"
41KBRANCH:class-devupstream = "v6.6/base" 41KBRANCH:class-devupstream = "v6.6/base"
42 42
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
44 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" 44 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
45 45
46LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 46LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
47LINUX_VERSION ?= "6.6.22" 47LINUX_VERSION ?= "6.6.32"
48 48
49PV = "${LINUX_VERSION}+git" 49PV = "${LINUX_VERSION}+git"
50 50
@@ -62,8 +62,10 @@ KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc
62KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 62KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
63KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 63KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
64KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" 64KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
65KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 65KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc features/nf_tables/nft_test.scc", "", d)}"
66KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}" 66KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}"
67# libteam ptests from meta-oe needs it
68KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/net/team/team.scc", "", d)}"
67KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" 69KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc"
68KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" 70KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc"
69KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc" 71KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc"
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb
index 9a4007fb25..d6c75d7580 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=http
12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \ 12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \
13 file://0001-Make-manpages-multilib-identical.patch \ 13 file://0001-Make-manpages-multilib-identical.patch \
14 " 14 "
15SRCREV = "66e76d1ea601705928899138f02730a3a2a3153d" 15SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4"
16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch
deleted file mode 100644
index a0d932c7b7..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 9e59c2f6387aeb832ae3af3095f987529722e08f Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 22 Jan 2024 11:10:37 -0500
4Subject: [PATCH 1/5] Fix: sched_stat_runtime changed in linux 6.8.0-rc1
5
6See upstream commit:
7
8 commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7
9 Author: Peter Zijlstra <peterz@infradead.org>
10 Date: Mon Nov 6 13:41:43 2023 +0100
11
12 sched: Remove vruntime from trace_sched_stat_runtime()
13
14 Tracing the runtime delta makes sense, observer can sum over time.
15 Tracing the absolute vruntime makes less sense, inconsistent:
16 absolute-vs-delta, but also vruntime delta can be computed from
17 runtime delta.
18
19 Removing the vruntime thing also makes the two tracepoint sites
20 identical, allowing to unify the code in a later patch.
21
22Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700]
23
24Change-Id: I24ebb4e06dbb646a1af75ac62b74f3821ff197de
25Signed-off-by: Kienan Stewart <kstewart@efficios.com>
26Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
27---
28 include/instrumentation/events/sched.h | 19 +++++++++++++++++++
29 1 file changed, 19 insertions(+)
30
31diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
32index 066a0f8..24cf37c 100644
33--- a/include/instrumentation/events/sched.h
34+++ b/include/instrumentation/events/sched.h
35@@ -646,6 +646,24 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked,
36 TP_ARGS(tsk, delay))
37 #endif
38
39+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
40+/*
41+ * Tracepoint for accounting runtime (time the task is executing
42+ * on a CPU).
43+ */
44+LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
45+
46+ TP_PROTO(struct task_struct *tsk, u64 runtime),
47+
48+ TP_ARGS(tsk, runtime),
49+
50+ TP_FIELDS(
51+ ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
52+ ctf_integer(pid_t, tid, tsk->pid)
53+ ctf_integer(u64, runtime, runtime)
54+ )
55+)
56+#else
57 /*
58 * Tracepoint for accounting runtime (time the task is executing
59 * on a CPU).
60@@ -663,6 +681,7 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
61 ctf_integer(u64, vruntime, vruntime)
62 )
63 )
64+#endif
65
66 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,12,0) || \
67 LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \
68--
692.39.2
70
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch
new file mode 100644
index 0000000000..c1e11f2bfb
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch
@@ -0,0 +1,142 @@
1From db0f940136afd43ce5fcf87c4d4e9ca558db1d4f Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 27 May 2024 13:04:42 -0400
4Subject: [PATCH 1/3] fix: btrfs: simplify delayed ref tracepoints (v6.10)
5
6See upstream commit:
7
8 commit 1bff6d4f873790cfc675afce9860208576508c5a
9 Author: Josef Bacik <josef@toxicpanda.com>
10 Date: Fri Apr 12 20:27:00 2024 -0400
11
12 btrfs: simplify delayed ref tracepoints
13
14 Now that all of the delayed ref information is in the delayed ref node,
15 drastically simplify the delayed ref tracepoints by simply passing in
16 the btrfs_delayed_ref_node and populating the tracepoints with the
17 values from the structure itself.
18
19Upstream-Status: Backport [commit db0f9401 fix: btrfs: simplify delayed ref tracepoints (v6.10)]
20
21Change-Id: Ic90bc23d6aa558baec33adc33b4d21e052e83375
22Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
23Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
24---
25 include/instrumentation/events/btrfs.h | 94 +++++++++++++++++++++++++-
26 1 file changed, 92 insertions(+), 2 deletions(-)
27
28diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
29index ffb1b646..d73c1ce5 100644
30--- a/include/instrumentation/events/btrfs.h
31+++ b/include/instrumentation/events/btrfs.h
32@@ -899,7 +899,51 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
33 )
34 #endif
35
36-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
37+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
38+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
39+
40+ TP_PROTO(const struct btrfs_fs_info *fs_info,
41+ const struct btrfs_delayed_ref_node *ref),
42+
43+ TP_ARGS(fs_info, ref),
44+
45+ TP_FIELDS(
46+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
47+ ctf_integer(u64, bytenr, ref->bytenr)
48+ ctf_integer(u64, num_bytes, ref->num_bytes)
49+ ctf_integer(int, action, ref->action)
50+ ctf_integer(u64, parent, ref->tree_ref.parent)
51+ ctf_integer(u64, ref_root, ref->tree_ref.root)
52+ ctf_integer(int, level, ref->tree_ref.level)
53+ ctf_integer(int, type, ref->type)
54+ ctf_integer(u64, seq, ref->seq)
55+ )
56+)
57+
58+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
59+
60+ add_delayed_tree_ref,
61+
62+ btrfs_add_delayed_tree_ref,
63+
64+ TP_PROTO(const struct btrfs_fs_info *fs_info,
65+ const struct btrfs_delayed_ref_node *ref),
66+
67+ TP_ARGS(fs_info, ref)
68+)
69+
70+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
71+
72+ run_delayed_tree_ref,
73+
74+ btrfs_run_delayed_tree_ref,
75+
76+ TP_PROTO(const struct btrfs_fs_info *fs_info,
77+ const struct btrfs_delayed_ref_node *ref),
78+
79+ TP_ARGS(fs_info, ref)
80+)
81+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
82 LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
83 LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
84 LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
85@@ -1139,7 +1183,53 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
86 )
87 #endif
88
89-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
90+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
91+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
92+
93+ TP_PROTO(const struct btrfs_fs_info *fs_info,
94+ const struct btrfs_delayed_ref_node *ref),
95+
96+ TP_ARGS(fs_info, ref),
97+
98+ TP_FIELDS(
99+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
100+ ctf_integer(u64, bytenr, ref->bytenr)
101+ ctf_integer(u64, num_bytes, ref->num_bytes)
102+ ctf_integer(int, action, ref->action)
103+ ctf_integer(u64, parent, ref->data_ref.parent)
104+ ctf_integer(u64, ref_root, ref->data_ref.root)
105+ ctf_integer(u64, owner, ref->data_ref.objectid)
106+ ctf_integer(u64, offset, ref->data_ref.offset)
107+ ctf_integer(int, type, ref->type)
108+ ctf_integer(u64, seq, ref->seq)
109+ )
110+)
111+
112+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
113+
114+ add_delayed_data_ref,
115+
116+ btrfs_add_delayed_data_ref,
117+
118+ TP_PROTO(const struct btrfs_fs_info *fs_info,
119+ const struct btrfs_delayed_ref_node *ref),
120+
121+ TP_ARGS(fs_info, ref)
122+)
123+
124+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
125+
126+ run_delayed_data_ref,
127+
128+ btrfs_run_delayed_data_ref,
129+
130+ TP_PROTO(const struct btrfs_fs_info *fs_info,
131+ const struct btrfs_delayed_ref_node *ref),
132+
133+ TP_ARGS(fs_info, ref)
134+)
135+
136+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
137 LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
138 LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
139 LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
140--
1412.39.2
142
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch
new file mode 100644
index 0000000000..bb659d5563
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch
@@ -0,0 +1,79 @@
1From c8adc20d19d853527a29411a03e114efdeff5f59 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 27 May 2024 10:49:45 -0400
4Subject: [PATCH] fix: close_on_exec(): pass files_struct instead of fdtable
5 (v6.10)
6
7See upstream commit:
8
9 commit f60d374d2cc88034385265d193a38e3f4a4b430c
10 Author: Al Viro <viro@zeniv.linux.org.uk>
11 Date: Thu Jan 4 21:35:38 2024 -0500
12
13 close_on_exec(): pass files_struct instead of fdtable
14
15 both callers are happier that way...
16
17Upstream-Status: Backport [c8adc20d fix: close_on_exec(): pass files_struct instead of fdtable (v6.10)]
18
19Change-Id: I8cdabb073c2090842b27b74954d86cb486c43b3e
20Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
21Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
22---
23 include/wrapper/fdtable.h | 14 ++++++++++++++
24 src/lttng-statedump-impl.c | 3 +--
25 2 files changed, 15 insertions(+), 2 deletions(-)
26
27Index: lttng-modules-2.13.13/include/wrapper/fdtable.h
28===================================================================
29--- lttng-modules-2.13.13.orig/include/wrapper/fdtable.h
30+++ lttng-modules-2.13.13/include/wrapper/fdtable.h
31@@ -69,20 +69,18 @@ int lttng_iterate_fd(struct files_struct
32
33 #endif
34
35-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
36-
37-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
38+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
39+static inline
40+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
41 {
42- return close_on_exec(fd, fdt);
43+ return close_on_exec(fd, files);
44 }
45-
46 #else
47-
48-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
49+static inline
50+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
51 {
52- return FD_ISSET(fd, fdt->close_on_exec);
53+ return close_on_exec(fd, files_fdtable(files));
54 }
55-
56 #endif
57
58 #endif /* _LTTNG_WRAPPER_FDTABLE_H */
59Index: lttng-modules-2.13.13/src/lttng-statedump-impl.c
60===================================================================
61--- lttng-modules-2.13.13.orig/src/lttng-statedump-impl.c
62+++ lttng-modules-2.13.13/src/lttng-statedump-impl.c
63@@ -44,7 +44,6 @@
64 #include <wrapper/tracepoint.h>
65 #include <wrapper/genhd.h>
66 #include <wrapper/file.h>
67-#include <wrapper/fdtable.h>
68 #include <wrapper/sched.h>
69
70 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
71@@ -451,7 +450,7 @@ int lttng_dump_one_fd(const void *p, str
72 * the lock is taken, but we are not aware whether this is
73 * guaranteed or not, so play safe.
74 */
75- if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
76+ if (fd < fdt->max_fds && lttng_close_on_exec(fd, ctx->files))
77 flags |= O_CLOEXEC;
78 if (IS_ERR(s)) {
79 struct dentry *dentry = file->f_path.dentry;
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch
deleted file mode 100644
index 5a4294db02..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From d52ab4b9a71a4bef535dadb8e7062112ac5c0c88 Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 22 Jan 2024 11:33:39 -0500
4Subject: [PATCH 2/5] Fix: timer_start changed in linux 6.8.0-rc1
5
6See upstream commit
7
8 commit dbcdcb62b59db2cf6a24113873b90da15c6f0b19
9 Author: Anna-Maria Behnsen <anna-maria@linutronix.de>
10 Date: Fri Dec 1 10:26:26 2023 +0100
11
12 tracing/timers: Enhance timer_start tracepoint
13
14 For starting a timer, the timer is enqueued into a bucket of the timer
15 wheel. The bucket expiry is the defacto expiry of the timer but it is not
16 equal the timer expiry because of increasing granularity when bucket is in
17 a higher level of the wheel. To be able to figure out in a trace whether a
18 timer expired in time or not, the bucket expiry time is required as well.
19
20 Add bucket expiry time to the timer_start tracepoint and thereby simplify
21 the arguments.
22
23Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700]
24
25Change-Id: I4868092765745b1efd0c48f13c0b837f2007dcb6
26Signed-off-by: Kienan Stewart <kstewart@efficios.com>
27Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
28---
29 include/instrumentation/events/timer.h | 24 +++++++++++++-----------
30 1 file changed, 13 insertions(+), 11 deletions(-)
31
32diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h
33index 91a2cd9..ce571f5 100644
34--- a/include/instrumentation/events/timer.h
35+++ b/include/instrumentation/events/timer.h
36@@ -45,8 +45,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
37 TP_ARGS(timer)
38 )
39
40-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0) || \
41- LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
42+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
43 /**
44 * timer_start - called when the timer is started
45 * @timer: pointer to struct timer_list
46@@ -55,39 +54,42 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
47 */
48 LTTNG_TRACEPOINT_EVENT(timer_start,
49
50- TP_PROTO(struct timer_list *timer, unsigned long expires,
51- unsigned int flags),
52+ TP_PROTO(struct timer_list *timer, unsigned long bucket_expiry),
53
54- TP_ARGS(timer, expires, flags),
55+ TP_ARGS(timer, bucket_expiry),
56
57 TP_FIELDS(
58 ctf_integer_hex(void *, timer, timer)
59 ctf_integer_hex(void *, function, timer->function)
60- ctf_integer(unsigned long, expires, expires)
61+ ctf_integer(unsigned long, expires, timer->expires)
62+ ctf_integer(unsigned long, bucket_expiry, bucket_expiry)
63 ctf_integer(unsigned long, now, jiffies)
64- ctf_integer(unsigned int, flags, flags)
65+ ctf_integer(unsigned int, flags, timer->flags)
66 )
67 )
68-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
69+#else
70 /**
71 * timer_start - called when the timer is started
72 * @timer: pointer to struct timer_list
73 * @expires: the timers expiry time
74+ * @flags: the timers expiry time
75 */
76 LTTNG_TRACEPOINT_EVENT(timer_start,
77
78- TP_PROTO(struct timer_list *timer, unsigned long expires),
79+ TP_PROTO(struct timer_list *timer, unsigned long expires,
80+ unsigned int flags),
81
82- TP_ARGS(timer, expires),
83+ TP_ARGS(timer, expires, flags),
84
85 TP_FIELDS(
86 ctf_integer_hex(void *, timer, timer)
87 ctf_integer_hex(void *, function, timer->function)
88 ctf_integer(unsigned long, expires, expires)
89 ctf_integer(unsigned long, now, jiffies)
90+ ctf_integer(unsigned int, flags, flags)
91 )
92 )
93-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
94+#endif
95
96 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \
97 LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0))
98--
992.39.2
100
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch
new file mode 100644
index 0000000000..5d0d1fb314
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch
@@ -0,0 +1,58 @@
1From 9bb17e292631f54fb5af4be4fae32ccd3d3d15c7 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 27 May 2024 13:13:15 -0400
4Subject: [PATCH 2/3] fix: btrfs: move ->parent and ->ref_root into
5 btrfs_delayed_ref_node (v6.10)
6
7See upstream commit:
8
9 commit cf4f04325b2b27efa5697ba0ea4c1abdee0035b4
10 Author: Josef Bacik <josef@toxicpanda.com>
11 Date: Fri Apr 12 22:57:13 2024 -0400
12
13 btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node
14
15 These two members are shared by both the tree refs and data refs, so
16 move them into btrfs_delayed_ref_node proper. This allows us to greatly
17 simplify the comparison code, as the shared refs always only sort on
18 parent, and the non shared refs always sort first on ref_root, and then
19 only data refs sort on their specific fields.
20
21Upstream-Status: Backport [9bb17e29 fix: btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node (v6.10)]
22
23Change-Id: Ib7c92cc4bb8d674ac66ccfa25c03476f7adaaf90
24Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
25Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
26---
27 include/instrumentation/events/btrfs.h | 8 ++++----
28 1 file changed, 4 insertions(+), 4 deletions(-)
29
30diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
31index d73c1ce5..c0c746e2 100644
32--- a/include/instrumentation/events/btrfs.h
33+++ b/include/instrumentation/events/btrfs.h
34@@ -912,8 +912,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
35 ctf_integer(u64, bytenr, ref->bytenr)
36 ctf_integer(u64, num_bytes, ref->num_bytes)
37 ctf_integer(int, action, ref->action)
38- ctf_integer(u64, parent, ref->tree_ref.parent)
39- ctf_integer(u64, ref_root, ref->tree_ref.root)
40+ ctf_integer(u64, parent, ref->parent)
41+ ctf_integer(u64, ref_root, ref->ref_root)
42 ctf_integer(int, level, ref->tree_ref.level)
43 ctf_integer(int, type, ref->type)
44 ctf_integer(u64, seq, ref->seq)
45@@ -1196,8 +1196,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
46 ctf_integer(u64, bytenr, ref->bytenr)
47 ctf_integer(u64, num_bytes, ref->num_bytes)
48 ctf_integer(int, action, ref->action)
49- ctf_integer(u64, parent, ref->data_ref.parent)
50- ctf_integer(u64, ref_root, ref->data_ref.root)
51+ ctf_integer(u64, parent, ref->parent)
52+ ctf_integer(u64, ref_root, ref->ref_root)
53 ctf_integer(u64, owner, ref->data_ref.objectid)
54 ctf_integer(u64, offset, ref->data_ref.offset)
55 ctf_integer(int, type, ref->type)
56--
572.39.2
58
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch
deleted file mode 100644
index 4ad9adc5c2..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 7432f583674294b676577b6505b89fc74dc5c7ab Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 22 Jan 2024 11:47:40 -0500
4Subject: [PATCH 3/5] Fix: strlcopy removed in linux 6.8.0-rc1
5
6See upstream commit:
7
8 commit d26270061ae66b915138af7cd73ca6f8b85e6b44
9 Author: Kees Cook <keescook@chromium.org>
10 Date: Thu Jan 18 12:31:55 2024 -0800
11
12 string: Remove strlcpy()
13
14 With all the users of strlcpy() removed[1] from the kernel, remove the
15 API, self-tests, and other references. Leave mentions in Documentation
16 (about its deprecation), and in checkpatch.pl (to help migrate host-only
17 tools/ usage). Long live strscpy().
18
19Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700]
20
21Change-Id: I27cdff70a504b25340cc59150ed8e959d9629e43
22Signed-off-by: Kienan Stewart <kstewart@efficios.com>
23Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
24---
25 src/lib/ringbuffer/ring_buffer_backend.c | 4 ++++
26 1 file changed, 4 insertions(+)
27
28diff --git a/src/lib/ringbuffer/ring_buffer_backend.c b/src/lib/ringbuffer/ring_buffer_backend.c
29index 9a339be..2181145 100644
30--- a/src/lib/ringbuffer/ring_buffer_backend.c
31+++ b/src/lib/ringbuffer/ring_buffer_backend.c
32@@ -405,7 +405,11 @@ int channel_backend_init(struct channel_backend *chanb,
33 chanb->extra_reader_sb =
34 (config->mode == RING_BUFFER_OVERWRITE) ? 1 : 0;
35 chanb->num_subbuf = num_subbuf;
36+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
37+ strscpy(chanb->name, name, NAME_MAX);
38+#else
39 strlcpy(chanb->name, name, NAME_MAX);
40+#endif
41 memcpy(&chanb->config, config, sizeof(chanb->config));
42
43 if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
44--
452.39.2
46
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch
new file mode 100644
index 0000000000..ab28f870c5
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch
@@ -0,0 +1,79 @@
1From 4ae0d960e149d1205d0cc167e44c120148c7f4f0 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 27 May 2024 11:11:21 -0400
4Subject: [PATCH 3/3] fix: net: udp: add IP/port data to the tracepoint
5 udp/udp_fail_queue_rcv_skb (v6.10)
6
7See upstream commit:
8
9 commit e9669a00bba79442dd4862c57761333d6a020c24
10 Author: Balazs Scheidler <bazsi77@gmail.com>
11 Date: Tue Mar 26 19:05:47 2024 +0100
12
13 net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb
14
15 The udp_fail_queue_rcv_skb() tracepoint lacks any details on the source
16 and destination IP/port whereas this information can be critical in case
17 of UDP/syslog.
18
19Upstream-Status: Backport [4ae0d960 fix: net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb (v6.10)]
20
21Change-Id: I0c337c5817b0a120298cbf5088d60671d9625b0d
22Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
23Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
24---
25 include/instrumentation/events/udp.h | 30 ++++++++++++++++++++++++++++
26 1 file changed, 30 insertions(+)
27
28diff --git a/include/instrumentation/events/udp.h b/include/instrumentation/events/udp.h
29index b63a1bb5..0a94b466 100644
30--- a/include/instrumentation/events/udp.h
31+++ b/include/instrumentation/events/udp.h
32@@ -7,7 +7,36 @@
33
34 #include <lttng/tracepoint-event.h>
35 #include <linux/udp.h>
36+#include <lttng/kernel-version.h>
37
38+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
39+LTTNG_TRACEPOINT_ENUM(lttng_sk_family,
40+ TP_ENUM_VALUES(
41+ ctf_enum_value("AF_INET", AF_INET)
42+ ctf_enum_value("AF_INET6", AF_INET6)
43+ )
44+)
45+
46+LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
47+
48+ TP_PROTO(int rc, struct sock *sk, struct sk_buff *skb),
49+
50+ TP_ARGS(rc, sk, skb),
51+
52+ TP_FIELDS(
53+ ctf_integer(int, rc, rc)
54+ ctf_integer(__u16, sport, ntohs(udp_hdr(skb)->source))
55+ ctf_integer(__u16, dport, ntohs(udp_hdr(skb)->dest))
56+ ctf_enum(lttng_sk_family, __u16, family, sk->sk_family)
57+ /*
58+ * The 'saddr' and 'daddr' fields from the upstream tracepoint
59+ * are currently not extracted. It is recommended to use a
60+ * tracepoint from the 'net' probe instead which includes all
61+ * fields from the IP header.
62+ */
63+ )
64+)
65+#else
66 LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
67
68 TP_PROTO(int rc, struct sock *sk),
69@@ -19,6 +48,7 @@ LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
70 ctf_integer(__u16, lport, inet_sk(sk)->inet_num)
71 )
72 )
73+#endif
74
75 #endif /* LTTNG_TRACE_UDP_H */
76
77--
782.39.2
79
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch
deleted file mode 100644
index c9b1af37c8..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch
+++ /dev/null
@@ -1,124 +0,0 @@
1From c8198382fe1cede3e16aae9978642a113a217e4c Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 22 Jan 2024 12:17:33 -0500
4Subject: [PATCH 4/5] Fix: btrfs_chunk tracepoints changed in linux 6.8.0-rc1
5
6See upstream commit:
7
8 commit 7dc66abb5a47778d7db327783a0ba172b8cff0b5
9 Author: Filipe Manana <fdmanana@suse.com>
10 Date: Tue Nov 21 13:38:38 2023 +0000
11
12 btrfs: use a dedicated data structure for chunk maps
13
14 Currently we abuse the extent_map structure for two purposes:
15
16 1) To actually represent extents for inodes;
17 2) To represent chunk mappings.
18
19 This is odd and has several disadvantages:
20
21 1) To create a chunk map, we need to do two memory allocations: one for
22 an extent_map structure and another one for a map_lookup structure, so
23 more potential for an allocation failure and more complicated code to
24 manage and link two structures;
25
26 2) For a chunk map we actually only use 3 fields (24 bytes) of the
27 respective extent map structure: the 'start' field to have the logical
28 start address of the chunk, the 'len' field to have the chunk's size,
29 and the 'orig_block_len' field to contain the chunk's stripe size.
30
31 Besides wasting a memory, it's also odd and not intuitive at all to
32 have the stripe size in a field named 'orig_block_len'.
33
34 We are also using 'block_len' of the extent_map structure to contain
35 the chunk size, so we have 2 fields for the same value, 'len' and
36 'block_len', which is pointless;
37
38 3) When an extent map is associated to a chunk mapping, we set the bit
39 EXTENT_FLAG_FS_MAPPING on its flags and then make its member named
40 'map_lookup' point to the associated map_lookup structure. This means
41 that for an extent map associated to an inode extent, we are not using
42 this 'map_lookup' pointer, so wasting 8 bytes (on a 64 bits platform);
43
44 4) Extent maps associated to a chunk mapping are never merged or split so
45 it's pointless to use the existing extent map infrastructure.
46
47 So add a dedicated data structure named 'btrfs_chunk_map' to represent
48 chunk mappings, this is basically the existing map_lookup structure with
49 some extra fields:
50
51 1) 'start' to contain the chunk logical address;
52 2) 'chunk_len' to contain the chunk's length;
53 3) 'stripe_size' for the stripe size;
54 4) 'rb_node' for insertion into a rb tree;
55 5) 'refs' for reference counting.
56
57 This way we do a single memory allocation for chunk mappings and we don't
58 waste memory for them with unused/unnecessary fields from an extent_map.
59
60 We also save 8 bytes from the extent_map structure by removing the
61 'map_lookup' pointer, so the size of struct extent_map is reduced from
62 144 bytes down to 136 bytes, and we can now have 30 extents map per 4K
63 page instead of 28.
64
65Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700]
66
67Change-Id: Ie52b5ac83df4bc6abeb84d958c4f5d24ae0d8c75
68Signed-off-by: Kienan Stewart <kstewart@efficios.com>
69Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
70---
71 include/instrumentation/events/btrfs.h | 37 +++++++++++++++++++++++++-
72 1 file changed, 36 insertions(+), 1 deletion(-)
73
74diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
75index 7c7b9b0..a2a412b 100644
76--- a/include/instrumentation/events/btrfs.h
77+++ b/include/instrumentation/events/btrfs.h
78@@ -1609,7 +1609,42 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head,
79 )
80 #endif
81
82-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0))
83+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
84+
85+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
86+
87+ TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_chunk_map *map,
88+ u64 offset, u64 size),
89+
90+ TP_ARGS(fs_info, map, offset, size),
91+
92+ TP_FIELDS(
93+ ctf_integer(int, num_stripes, map->num_stripes)
94+ ctf_integer(u64, type, map->type)
95+ ctf_integer(int, sub_stripes, map->sub_stripes)
96+ ctf_integer(u64, offset, offset)
97+ ctf_integer(u64, size, size)
98+ ctf_integer(u64, root_objectid, fs_info->chunk_root->root_key.objectid)
99+ )
100+)
101+
102+LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_alloc,
103+
104+ TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_chunk_map *map,
105+ u64 offset, u64 size),
106+
107+ TP_ARGS(fs_info, map, offset, size)
108+)
109+
110+LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free,
111+
112+ TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_chunk_map *map,
113+ u64 offset, u64 size),
114+
115+ TP_ARGS(fs_info, map, offset, size)
116+)
117+
118+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0))
119
120 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
121
122--
1232.39.2
124
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch
deleted file mode 100644
index 65c33dafef..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch
+++ /dev/null
@@ -1,88 +0,0 @@
1From 86db094386b43bb5c6b47552f9a4826ca8ba917d Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 22 Jan 2024 13:13:36 -0500
4Subject: [PATCH 5/5] Fix: btrfs_get_extent flags and compress_type changed in
5 linux 6.8.0-rc1
6
7See upstream commit:
8
9 commit f86f7a75e2fb5fd7d31d00eab8a392f97ba42ce9
10 Author: Filipe Manana <fdmanana@suse.com>
11 Date: Mon Dec 4 16:20:33 2023 +0000
12
13 btrfs: use the flags of an extent map to identify the compression type
14
15 Currently, in struct extent_map, we use an unsigned int (32 bits) to
16 identify the compression type of an extent and an unsigned long (64 bits
17 on a 64 bits platform, 32 bits otherwise) for flags. We are only using
18 6 different flags, so an unsigned long is excessive and we can use flags
19 to identify the compression type instead of using a dedicated 32 bits
20 field.
21
22 We can easily have tens or hundreds of thousands (or more) of extent maps
23 on busy and large filesystems, specially with compression enabled or many
24 or large files with tons of small extents. So it's convenient to have the
25 extent_map structure as small as possible in order to use less memory.
26
27 So remove the compression type field from struct extent_map, use flags
28 to identify the compression type and shorten the flags field from an
29 unsigned long to a u32. This saves 8 bytes (on 64 bits platforms) and
30 reduces the size of the structure from 136 bytes down to 128 bytes, using
31 now only two cache lines, and increases the number of extent maps we can
32 have per 4K page from 30 to 32. By using a u32 for the flags instead of
33 an unsigned long, we no longer use test_bit(), set_bit() and clear_bit(),
34 but that level of atomicity is not needed as most flags are never cleared
35 once set (before adding an extent map to the tree), and the ones that can
36 be cleared or set after an extent map is added to the tree, are always
37 performed while holding the write lock on the extent map tree, while the
38 reader holds a lock on the tree or tests for a flag that never changes
39 once the extent map is in the tree (such as compression flags).
40
41Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700]
42
43Change-Id: I95402d43f064c016b423b48652e4968d3db9b8a9
44Signed-off-by: Kienan Stewart <kstewart@efficios.com>
45Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
46---
47 include/instrumentation/events/btrfs.h | 25 ++++++++++++++++++++++++-
48 1 file changed, 24 insertions(+), 1 deletion(-)
49
50diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
51index a2a412b..ffb1b64 100644
52--- a/include/instrumentation/events/btrfs.h
53+++ b/include/instrumentation/events/btrfs.h
54@@ -177,7 +177,30 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
55 )
56 #endif
57
58-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0))
59+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
60+
61+LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
62+
63+ TP_PROTO(const struct btrfs_root *root, const struct btrfs_inode *inode,
64+ const struct extent_map *map),
65+
66+ TP_ARGS(root, inode, map),
67+
68+ TP_FIELDS(
69+ ctf_integer(u64, root_objectid, root->root_key.objectid)
70+ ctf_integer(u64, ino, btrfs_ino(inode))
71+ ctf_integer(u64, start, map->start)
72+ ctf_integer(u64, len, map->len)
73+ ctf_integer(u64, orig_start, map->orig_start)
74+ ctf_integer(u64, block_start, map->block_start)
75+ ctf_integer(u64, block_len, map->block_len)
76+ ctf_integer(unsigned int, flags, map->flags)
77+ ctf_integer(int, refs, refcount_read(&map->refs))
78+ ctf_integer(unsigned int, compress_type, extent_map_compression(map))
79+ )
80+)
81+
82+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0))
83
84 LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
85
86--
872.39.2
88
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch
deleted file mode 100644
index c35f5b61fa..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From c1e074414f087b6ecc229a9385a44eb3b3dfeaea Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 5 Feb 2024 08:52:29 -0500
4Subject: [PATCH] Fix: ext4_discard_preallocations changed in linux 6.8.0-rc3
5
6See upstream commit:
7
8 commit f0e54b6087de9571ec61c189d6c378b81edbe3b2
9 Author: Kemeng Shi <shikemeng@huaweicloud.com>
10 Date: Fri Jan 5 17:21:02 2024 +0800
11
12 ext4: remove 'needed' in trace_ext4_discard_preallocations
13
14 As 'needed' to trace_ext4_discard_preallocations is always 0 which
15 is meaningless. Just remove it.
16
17Change-Id: Ib6b698ca553c4beebd4ca791c83bbbb927901758
18Signed-off-by: Kienan Stewart <kstewart@efficios.com>
19Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
20
21Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2da4de37de6382b4440737fdf4320e08a089afcd]
22
23Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
24---
25 include/instrumentation/events/ext4.h | 14 +++++++++++++-
26 1 file changed, 13 insertions(+), 1 deletion(-)
27
28diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h
29index 222416e..05a6453 100644
30--- a/include/instrumentation/events/ext4.h
31+++ b/include/instrumentation/events/ext4.h
32@@ -490,7 +490,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
33 )
34 #endif
35
36-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \
37+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
38+LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
39+ TP_PROTO(struct inode *inode, unsigned int len),
40+
41+ TP_ARGS(inode, len),
42+
43+ TP_FIELDS(
44+ ctf_integer(dev_t, dev, inode->i_sb->s_dev)
45+ ctf_integer(ino_t, ino, inode->i_ino)
46+ ctf_integer(unsigned int, len, len)
47+ )
48+)
49+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \
50 LTTNG_KERNEL_RANGE(5,8,6, 5,9,0))
51 LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
52 TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed),
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.11.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
index 5d2379df84..75b144757a 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.11.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
@@ -10,18 +10,16 @@ inherit module
10include lttng-platforms.inc 10include lttng-platforms.inc
11 11
12SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch \ 13 file://0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch \
14 file://0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch \ 14 file://0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch \
15 file://0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch \ 15 file://0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch \
16 file://0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch \ 16 file://0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch \
17 file://0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch \
18 file://0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch \
19 " 17 "
20 18
21# Use :append here so that the patch is applied also when using devupstream 19# Use :append here so that the patch is applied also when using devupstream
22SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" 20SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
23 21
24SRC_URI[sha256sum] = "297211d6fda459c85793c1f498c90fad2939cda7939d503f3ec5eaaf5fbec3c7" 22SRC_URI[sha256sum] = "7d26c07a5e80b66aa7bdcfdaaf4857f00fc9a5cdde79226b2528676700d50228"
25 23
26export INSTALL_MOD_DIR="kernel/lttng-modules" 24export INSTALL_MOD_DIR="kernel/lttng-modules"
27 25
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch
new file mode 100644
index 0000000000..3286dfb5c1
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch
@@ -0,0 +1,56 @@
1From 6b45c5f80d20e7bbf3d98c1fa17d2cf8716af3bb Mon Sep 17 00:00:00 2001
2From: Xiangyu Chen <xiangyu.chen@windriver.com>
3Date: Mon, 25 Mar 2024 18:20:14 +0800
4Subject: [PATCH] Fix: rotation-destroy-flush: fix session daemon abort if no
5 kernel module present
6
7Testing rotation-destroy-flush when no lttng kernel modules present, it would
8be failed with error message:
9
10 Error: Unable to load required module lttng-ring-buffer-client-discard
11 not ok 1 - Start session daemon
12 Failed test 'Start session daemon'
13 not ok 2 - Create session rotation_destroy_flush in -o /tmp/tmp.test_rot ...
14 ...
15
16This because test script that sets the LTTNG_ABORT_ON_ERROR environment
17variable. It's this environment variable that causes the sessiond to handle the
18kernel module loading failure as an abort rather than a warning.
19
20Using "check_skip_kernel_test" to detect whether the kernel module fails to
21load is expected or not. If the failure is expected, the script won't set that
22environment variable any more.
23
24Fixes: 3a174400
25("tests:add check_skip_kernel_test to check root user and lttng kernel modules")
26
27Upstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/12155]
28
29Change-Id: I371e9ba717613e2940186f710cf3cccd35baed6c
30Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
31---
32 .../ust/rotation-destroy-flush/test_rotation_destroy_flush | 6 +++---
33 1 file changed, 3 insertions(+), 3 deletions(-)
34
35diff --git a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
36index 669bcbc43..64161768f 100755
37--- a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
38+++ b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
39@@ -23,11 +23,11 @@ SIZE_LIMIT=$PAGE_SIZE
40 NR_ITER=10
41 NUM_TESTS=$((15*$NR_ITER))
42
43-# Ensure the daemons invoke abort on error.
44-export LTTNG_ABORT_ON_ERROR=1
45-
46 source $TESTDIR/utils/utils.sh
47
48+# Ensure the daemons invoke abort on error.
49+check_skip_kernel_test || export LTTNG_ABORT_ON_ERROR=1
50+
51 # MUST set TESTDIR before calling those functions
52 function run_app()
53 {
54--
552.25.1
56
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
index 2d08b08879..2f95889c4b 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
@@ -1,4 +1,4 @@
1From ab238c213fac190972f55e73cf3e0bb1c7846eb8 Mon Sep 17 00:00:00 2001 1From 2237748af00467ad8250a7ccd944200f811db69a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 12 Dec 2019 16:52:07 +0100 3Date: Thu, 12 Dec 2019 16:52:07 +0100
4Subject: [PATCH] tests: do not strip a helper library 4Subject: [PATCH] tests: do not strip a helper library
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am 12diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
13index 03f5d5a..d12c343 100644 13index 836f13e..e19a554 100644
14--- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am 14--- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
15+++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am 15+++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
16@@ -12,7 +12,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la 16@@ -14,7 +14,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la
17 libfoo.strip: libfoo.la 17 libfoo.strip: libfoo.la
18 $(OBJCOPY) --strip-all .libs/libfoo.so 18 $(OBJCOPY) --strip-all .libs/libfoo.so
19 19
@@ -22,6 +22,3 @@ index 03f5d5a..d12c343 100644
22 @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ 22 @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
23 for script in $(EXTRA_DIST); do \ 23 for script in $(EXTRA_DIST); do \
24 cp -f $(srcdir)/$$script $(builddir); \ 24 cp -f $(srcdir)/$$script $(builddir); \
25--
262.17.1
27
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.11.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb
index 08144e271c..e73dd4801a 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.11.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb
@@ -38,9 +38,10 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
38 file://disable-tests.patch \ 38 file://disable-tests.patch \
39 file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \ 39 file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \
40 file://0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch \ 40 file://0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch \
41 file://0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch \
41 " 42 "
42 43
43SRC_URI[sha256sum] = "ac5baeef9fa690936b1ca01ecd1742da762c2c08511ff1b4e923938d94d0f979" 44SRC_URI[sha256sum] = "ff5f4f00b081dac66092afe8e72b7c790670931cf1c1ee0deaa7f80fbc53883e"
44 45
45inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 46inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
46 47
@@ -68,7 +69,7 @@ PRIVATE_LIBS:${PN}-ptest = "libfoo.so"
68do_install:append () { 69do_install:append () {
69 # install systemd unit file 70 # install systemd unit file
70 install -d ${D}${systemd_system_unitdir} 71 install -d ${D}${systemd_system_unitdir}
71 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir} 72 install -m 0644 ${UNPACKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir}
72} 73}
73 74
74do_install_ptest () { 75do_install_ptest () {
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb
index 9509185bad..dddd3a5004 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb
@@ -34,7 +34,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
34 file://0001-Makefile.am-update-rpath-link.patch \ 34 file://0001-Makefile.am-update-rpath-link.patch \
35 " 35 "
36 36
37SRC_URI[sha256sum] = "5fb4f17c307c8c1b79c68561e89be9562d07e7425bf40e728c4d66755342a5eb" 37SRC_URI[sha256sum] = "d4ef98dab9a37ad4f524ccafdfd50af4f266039b528dd5afabce78e49024d937"
38 38
39CVE_PRODUCT = "ust" 39CVE_PRODUCT = "ust"
40 40
diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index a91680d497..581e90e9b4 100644
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -8,7 +8,8 @@ inherit pkgconfig
8 8
9PACKAGE_ARCH = "${MACHINE_ARCH}" 9PACKAGE_ARCH = "${MACHINE_ARCH}"
10 10
11S = "${WORKDIR}" 11S = "${WORKDIR}/sources"
12UNPACKDIR = "${S}"
12 13
13do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot" 14do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot"
14do_compile[depends] += "virtual/kernel:do_compile_kernelmodules" 15do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index b630a402ff..49268445a8 100644
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
@@ -4,8 +4,8 @@ LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://modutils.sh;beginline=3;endline=3;md5=b2dccaa94b3629a08bfb4f983cad6f89" 4LIC_FILES_CHKSUM = "file://modutils.sh;beginline=3;endline=3;md5=b2dccaa94b3629a08bfb4f983cad6f89"
5SRC_URI = "file://modutils.sh" 5SRC_URI = "file://modutils.sh"
6 6
7 7S = "${WORKDIR}/sources"
8S = "${WORKDIR}" 8UNPACKDIR = "${S}"
9 9
10INITSCRIPT_NAME = "modutils.sh" 10INITSCRIPT_NAME = "modutils.sh"
11INITSCRIPT_PARAMS = "start 06 S ." 11INITSCRIPT_PARAMS = "start 06 S ."
@@ -17,7 +17,7 @@ do_compile () {
17 17
18do_install () { 18do_install () {
19 install -d ${D}${sysconfdir}/init.d/ 19 install -d ${D}${sysconfdir}/init.d/
20 install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/ 20 install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/
21} 21}
22 22
23PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" 23PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 4f26813de0..11fa917649 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -129,6 +129,10 @@ EXTRA_OEMAKE += "\
129# honour a JOBS variable. 129# honour a JOBS variable.
130EXTRA_OEMAKE:append:task-configure = " JOBS=1" 130EXTRA_OEMAKE:append:task-configure = " JOBS=1"
131 131
132# the architectures that need this file can be found in
133# tools/include/uapi/asm/bpf_perf_event.h
134# We are only listing supported arches at the moment
135PERF_BPF_EVENT_SRC ?= '${@bb.utils.contains_any("ARCH", [ "riscv", "arm64" ], "arch/${ARCH}/include/uapi/asm/bpf_perf_event.h", "", d)}'
132PERF_SRC ?= "Makefile \ 136PERF_SRC ?= "Makefile \
133 tools/arch \ 137 tools/arch \
134 tools/build \ 138 tools/build \
@@ -139,6 +143,7 @@ PERF_SRC ?= "Makefile \
139 tools/scripts \ 143 tools/scripts \
140 scripts/ \ 144 scripts/ \
141 arch/arm64/tools \ 145 arch/arm64/tools \
146 ${PERF_BPF_EVENT_SRC} \
142 arch/${ARCH}/Makefile \ 147 arch/${ARCH}/Makefile \
143" 148"
144 149
@@ -230,14 +235,18 @@ do_configure:prepend () {
230 if [ -e "${S}/tools/perf/Makefile.perf" ]; then 235 if [ -e "${S}/tools/perf/Makefile.perf" ]; then
231 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 236 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
232 ${S}/tools/perf/Makefile.perf 237 ${S}/tools/perf/Makefile.perf
238 # Variant with linux-yocto-specific patch
233 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \ 239 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \
234 ${S}/tools/perf/Makefile.perf 240 ${S}/tools/perf/Makefile.perf
241 # Variant for mainline Linux
242 sed -i -e "s,root='/\$(DESTDIR_SQ)',prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='/\$(DESTDIR_SQ)',g" \
243 ${S}/tools/perf/Makefile.perf
235 # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 244 # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8
236 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ 245 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \
237 ${S}/tools/perf/Makefile.perf 246 ${S}/tools/perf/Makefile.perf
238 fi 247 fi
239 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ 248 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
240 ${S}/tools/perf/Makefile* 249 ${S}/tools/perf/Makefile
241 250
242 if [ -e "${S}/tools/build/Makefile.build" ]; then 251 if [ -e "${S}/tools/build/Makefile.build" ]; then
243 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 252 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
@@ -382,7 +391,7 @@ RDEPENDS:${PN} += "elfutils bash"
382RDEPENDS:${PN}-archive =+ "bash" 391RDEPENDS:${PN}-archive =+ "bash"
383RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" 392RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
384RDEPENDS:${PN}-perl =+ "bash perl perl-modules" 393RDEPENDS:${PN}-perl =+ "bash perl perl-modules"
385RDEPENDS:${PN}-tests =+ "python3 bash" 394RDEPENDS:${PN}-tests =+ "python3 bash perl"
386 395
387RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests \ 396RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests \
388 ${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl', '', d)} \ 397 ${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl', '', d)} \
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch
deleted file mode 100644
index 2d46a3962d..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 5a01e28bd806326b2143e3e6bb28d4780c5d879d Mon Sep 17 00:00:00 2001
2From: Victor Kamensky <victor.kamensky7@gmail.com>
3Date: Sun, 3 Dec 2023 18:40:05 -0800
4Subject: [PATCH] Makefile.am: remove runtime/linux/uprobes and
5 runtime/linux/uprobes2 install
6
7"PR30434 continuation: Removed old uprobes, uprobes2 implementation,
8uprobes-inc.h & any mentions of CONFIG_UTRACE." commit removed uprobes,
9and uprobes2 sources and directories, but Makefile.am still tries to
10install them. In fact after failing to 'cd' into runtime/linux/uprobes
11directory it copies top level *.[ch] files into
12${prefix}/share/systemtap/runtime/linux/uprobes directory.
13
14The issue was caught by OpenEmbedded project do_package_qa checks.
15
16Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
17
18Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2023q4/027880.html]
19---
20 Makefile.am | 4 ----
21 1 file changed, 4 deletions(-)
22
23diff --git a/Makefile.am b/Makefile.am
24index 5737c6b20..2ba896088 100644
25--- a/Makefile.am
26+++ b/Makefile.am
27@@ -277,10 +277,6 @@ endif
28 do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/softfloat/$$f; done)
29 (cd $(srcdir)/runtime/linux; for f in *.[ch]; \
30 do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/$$f; done)
31- (cd $(srcdir)/runtime/linux/uprobes; for f in Makefile *.[ch]; \
32- do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes/$$f; done)
33- (cd $(srcdir)/runtime/linux/uprobes2; for f in *.[ch]; \
34- do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes2/$$f; done)
35 (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name '*.stpm' -o -name README \) -print \
36 | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done)
37 (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \
38--
392.31.1
40
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch b/meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch
deleted file mode 100644
index e3d94d9312..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From d42139cf9cd26d0c0363fcfe007716baeb8de517 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Fri, 22 Dec 2023 19:42:38 +0000
4Subject: [PATCH] bpf-translate.cxx: fix build against upcoming `gcc-14`
5 (`-Werror=calloc-transposed-args`)
6
7`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
8detected minor infelicity in `calloc()` API usage in `systemtap`:
9
10 bpf-translate.cxx: In function 'bpf::BPF_Section* bpf::output_probe(BPF_Output&, program&, const std::string&, unsigned int)':
11 bpf-translate.cxx:5044:39: error: 'void* calloc(size_t, size_t)' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
12 5044 | bpf_insn *buf = (bpf_insn*) calloc (sizeof(bpf_insn), ninsns);
13 | ^~~~~~~~~~~~~~~~
14 bpf-translate.cxx:5044:39: note: earlier argument should specify number of elements, later size of each element
15
16Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=d42139cf9cd26d0c0363fcfe007716baeb8de517]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 bpf-translate.cxx | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/bpf-translate.cxx b/bpf-translate.cxx
23index 1a9302463..aa8ef65ce 100644
24--- a/bpf-translate.cxx
25+++ b/bpf-translate.cxx
26@@ -5041,9 +5041,9 @@ output_probe(BPF_Output &eo, program &prog,
27 }
28 }
29
30- bpf_insn *buf = (bpf_insn*) calloc (sizeof(bpf_insn), ninsns);
31+ bpf_insn *buf = (bpf_insn*) calloc (ninsns, sizeof(bpf_insn));
32 assert (buf);
33- Elf64_Rel *rel = (Elf64_Rel*) calloc (sizeof(Elf64_Rel), nreloc);
34+ Elf64_Rel *rel = (Elf64_Rel*) calloc (nreloc, sizeof(Elf64_Rel));
35 assert (rel);
36
37 unsigned i = 0, r = 0;
38--
392.43.0
40
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch b/meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch
deleted file mode 100644
index 98641826f6..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 3913ad3e28a19811e1b52338112344a487057e4f Mon Sep 17 00:00:00 2001
2From: Victor Kamensky <victor.kamensky7@gmail.com>
3Date: Mon, 18 Dec 2023 03:13:38 +0000
4Subject: [PATCH 1/2] configure.ac: fix broken libdebuginfod library auto
5 detection
6
7After 2e67b053e3796ee7cf29a39f9698729b52078406 "configury: rework debuginfod searches"
8commit, libdebuginfod.so library auto detection is broken. It was reported by Martin Jansa
9on openembedded-core mailing list [1].
10
11Currently configure.ac does "AC_DEFINE([HAVE_LIBDEBUGINFOD], [1] ..." as long as
12no --without-debuginfod option is passed, regardless PKG_CHECK_MODULES check result.
13It seems to be bad copy/paste. Address the issue by moving the AC_DEFINE back to
14PKG_CHECK_MODULES action-if-found block.
15
16To reproduce the issue on FC system, one can do the following
17"sudo dnf remove elfutils-debuginfod-client-devel" and then try to build SystemTap
18util.cxx will fail to compile because of missing elfutils/debuginfod.h because
19config.h will have "#define HAVE_LIBDEBUGINFOD 1", while config.log and configure
20output indicates that check for libdebuginfod library failed.
21
22[1] https://lists.openembedded.org/g/openembedded-core/message/192109?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C0%2Csystemtap%2C20%2C2%2C0%2C102987514
23
24Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2023q4/027914.html]
25Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
26---
27 configure.ac | 5 ++---
28 1 file changed, 2 insertions(+), 3 deletions(-)
29
30diff --git a/configure.ac b/configure.ac
31index d9559c5c3..18cd7f84a 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -219,12 +219,11 @@ dnl take the user at his or her word
35 elif test "x$with_debuginfod" != xno; then
36 dnl check in the system pkgconfig
37 PKG_CHECK_MODULES([debuginfod], [libdebuginfod >= 0.179],
38- [have_debuginfod=1],
39+ [have_debuginfod=1
40+ AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], [Define to 1 if debuginfod is enabled.])],
41 [if test "x$with_debuginfod" = xyes; then
42 AC_MSG_ERROR(["--with-debuginfod was given, but libdebuginfod is missing or unusable."])
43 fi])
44- AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], [Define to 1 if debuginfod is enabled.])
45- AC_MSG_RESULT([yes])
46 else
47 AC_MSG_RESULT([no])
48 fi
49--
502.31.1
51
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch
new file mode 100644
index 0000000000..0c2888400d
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch
@@ -0,0 +1,32 @@
1From 91caf37e4dfe862f9b68447b1597c0d0f31523c3 Mon Sep 17 00:00:00 2001
2From: "Frank Ch. Eigler" <fche@redhat.com>
3Date: Tue, 7 May 2024 15:04:04 -0400
4Subject: [PATCH] elaborate.cxx: gcc version compatibility hack redux
5
6Note __GNUC__ >= 14 for this diagnostic.
7
8Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=91caf37e4dfe862f9b68447b1597c0d0f31523c3]
9Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
10---
11 elaborate.cxx | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/elaborate.cxx b/elaborate.cxx
15index 88505559b..c08023f1d 100644
16--- a/elaborate.cxx
17+++ b/elaborate.cxx
18@@ -2656,9 +2656,11 @@ symresolution_info::symresolution_info (systemtap_session& s, bool omniscient_un
19 session (s), unmangled_p(omniscient_unmangled), current_function (0), current_probe (0)
20 {
21 #pragma GCC diagnostic push
22+ #if __GNUC__ >= 14
23 // c10s early snapshot GCC complains about this construct, which is
24 // made safe via our dtor usage
25 #pragma GCC diagnostic ignored "-Wdangling-pointer"
26+ #endif
27 saved_session_symbol_resolver = s.symbol_resolver;
28 s.symbol_resolver = this; // save resolver for early PR25841 function resolution
29 #pragma GCC diagnostic pop
30--
312.45.2
32
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch
new file mode 100644
index 0000000000..7cdcc93f14
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch
@@ -0,0 +1,52 @@
1From d11241bdd05bc4c745c8aef53a2725331e1a93b4 Mon Sep 17 00:00:00 2001
2From: "Frank Ch. Eigler" <fche@redhat.com>
3Date: Tue, 7 May 2024 14:25:12 -0400
4Subject: [PATCH] elaborate.cxx: gcc version compatibility hack
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Suppress -Wdangling-pointer for a construct that appears valid, but
10one particular GCC snapshot version complains about.
11
12In constructor ‘symresolution_info::symresolution_info(systemtap_session&, bool)’,
13inlined from ‘int semantic_pass_symbols(systemtap_session&)’ at ../systemtap/elaborate.cxx:1872:28:
14../systemtap/elaborate.cxx:2659:21: error: storing the address of local variable ‘sym’ in ‘*s.systemtap_session::symbol_resolver’ [-Werror=dangling-pointer=]
15 2659 | s.symbol_resolver = this; // save resolver for early PR25841 function resolution
16 | ~~~~~~~~~~~~~~~~~~^~~~~~
17../systemtap/elaborate.cxx: In function ‘int semantic_pass_symbols(systemtap_session&)’:
18../systemtap/elaborate.cxx:1872:22: note: ‘sym’ declared here
19 1872 | symresolution_info sym (s);
20 | ^~~
21../systemtap/elaborate.cxx:1870:43: note: ‘s’ declared here
22 1870 | semantic_pass_symbols (systemtap_session& s)
23 | ~~~~~~~~~~~~~~~~~~~^
24cc1plus: all warnings being treated as errors
25
26Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=d11241bdd05bc4c745c8aef53a2725331e1a93b4]
27Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
28---
29 elaborate.cxx | 5 +++++
30 1 file changed, 5 insertions(+)
31
32diff --git a/elaborate.cxx b/elaborate.cxx
33index 8bf9e6c06..88505559b 100644
34--- a/elaborate.cxx
35+++ b/elaborate.cxx
36@@ -2655,8 +2655,13 @@ semantic_pass (systemtap_session& s)
37 symresolution_info::symresolution_info (systemtap_session& s, bool omniscient_unmangled):
38 session (s), unmangled_p(omniscient_unmangled), current_function (0), current_probe (0)
39 {
40+ #pragma GCC diagnostic push
41+ // c10s early snapshot GCC complains about this construct, which is
42+ // made safe via our dtor usage
43+ #pragma GCC diagnostic ignored "-Wdangling-pointer"
44 saved_session_symbol_resolver = s.symbol_resolver;
45 s.symbol_resolver = this; // save resolver for early PR25841 function resolution
46+ #pragma GCC diagnostic pop
47 }
48
49
50--
512.45.2
52
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch b/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch
deleted file mode 100644
index afdc10a3fe..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001
2From: "Frank Ch. Eigler" <fche@redhat.com>
3Date: Sat, 4 Nov 2023 12:19:59 -0400
4Subject: [PATCH] prerelease datestamp fixes
5
6Upstream-Status: Backport
7---
8 NEWS | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/NEWS b/NEWS
12index c7f31e8b7..f0f9056c4 100644
13--- a/NEWS
14+++ b/NEWS
15@@ -1,4 +1,4 @@
16-* What's new in version 5.0, 2023-11-03
17+* What's new in version 5.0, 2023-11-04
18
19 - Performance improvements in uprobe registration and module startup.
20
21--
222.31.1
23
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch
deleted file mode 100644
index 22578fb3f6..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 52596f023652114642faba5726c99488529029ce Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Thu, 21 Dec 2023 10:00:06 +0000
4Subject: [PATCH] staprun: fix build against upcoming `gcc-14`
5 (`-Werror=calloc-transposed-args`)
6
7`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
8detected minor infelicity in `calloc()` API usage in `systemtap`:
9
10 staprun.c: In function 'main':
11 staprun.c:550:50: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
12 550 | char ** new_argv = calloc(sizeof(char *),argc+2);
13 | ^~~~
14
15Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=52596f023652114642faba5726c99488529029ce]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 staprun/staprun.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/staprun/staprun.c b/staprun/staprun.c
22index 8437f3af6..d1b0b221b 100644
23--- a/staprun/staprun.c
24+++ b/staprun/staprun.c
25@@ -547,7 +547,7 @@ int main(int argc, char **argv)
26 us to extend argv[], with all the C fun that entails. */
27 #ifdef HAVE_OPENAT
28 if (relay_basedir_fd >= 0) {
29- char ** new_argv = calloc(sizeof(char *),argc+2);
30+ char ** new_argv = calloc(argc+2, sizeof(char *));
31 const int new_Foption_size = 10; /* -FNNNNN */
32 char * new_Foption = malloc(new_Foption_size);
33 int i;
34--
352.43.0
36
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index c574bcb2ba..80945ad7f8 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,17 +1,14 @@
1LICENSE = "GPL-2.0-only" 1LICENSE = "GPL-2.0-only"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" 3SRCREV = "3a0c9c15163520dd0d9ab07177da62ce9cc2332f"
4PV = "5.0" 4PV = "5.1"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ 6SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \
7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ 7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
8 file://0001-Install-python-modules-to-correct-library-dir.patch \ 8 file://0001-Install-python-modules-to-correct-library-dir.patch \
9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ 9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
10 file://0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch \ 10 file://0001-elaborate.cxx-gcc-version-compatibility-hack.patch \
11 file://0001-prerelease-datestamp-fixes.patch \ 11 file://0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch \
12 file://0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch \
13 file://0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch \
14 file://0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch \
15 " 12 "
16 13
17COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' 14COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.01.23.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.05.08.bb
index 8fde236ab4..95e33d9fb1 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.01.23.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.05.08.bb
@@ -5,7 +5,7 @@ LICENSE = "ISC"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
6 6
7SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" 7SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
8SRC_URI[sha256sum] = "c8a61c9acf76fa7eb4239e89f640dee3e87098d9f69b4d3518c9c60fc6d20c55" 8SRC_URI[sha256sum] = "9aee1d86ebebb363b714bec941b2820f31e3b7f1a485ddc9fcbd9985c7d3e7c4"
9 9
10inherit bin_package allarch 10inherit bin_package allarch
11 11