[PATCH 01/45] selftest/locales: opt out of ptests in DISTRO_FEATURES

[PATCH 01/45] selftest/locales: opt out of ptests in DISTRO_FEATURES

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

selftests/locales tests configure glibc-locales to produce a restricted set,
and build core-image-minimal. This is problematic if something in
the dependency chain of that image relies on locales not in that set.

Until now, by coincidence, nothing did, but recent version updates
(particularly, json-c which relies on xxd in its ptest) pull in glib-2.0,
which for its ptest requires various locales not in the set. This causes
package_qa errors.

To address this particular error, and to minimize chances of it happening
again, let's build images for this selftest without ptest enabled; typically
only ptests want locales.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/selftest/cases/locales.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oeqa/selftest/cases/locales.py b/meta/lib/oeqa/selftest/cases/locales.py
index ac4888ef66..9f04db2129 100644
--- a/meta/lib/oeqa/selftest/cases/locales.py
+++ b/meta/lib/oeqa/selftest/cases/locales.py
@@ -16,6 +16,7 @@ class LocalesTest(OESelftestTestCase):
         features.append('IMAGE_INSTALL:append = " glibc-utils localedef"')
         features.append('GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8"')
         features.append('IMAGE_LINGUAS:append = " en-us fr-fr"')
+        features.append('DISTRO_FEATURES_OPTED_OUT += "ptest"')
         if binary_enabled:
             features.append('ENABLE_BINARY_LOCALE_GENERATION = "1"')
         else:
-- 
2.47.3

[PATCH 02/45] files/common-licenses/MIT-with-fmt-exception: add a custom license

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

This is needed to correctly specify fmt's LICENSE, as support
for license exceptions and WITH statement isn't yet implemented:
https://lists.openembedded.org/g/openembedded-core/message/239820

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../common-licenses/MIT-with-fmt-exception    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 meta/files/common-licenses/MIT-with-fmt-exception

diff --git a/meta/files/common-licenses/MIT-with-fmt-exception b/meta/files/common-licenses/MIT-with-fmt-exception
new file mode 100644
index 0000000000..1cd1ef9269
--- /dev/null
+++ b/meta/files/common-licenses/MIT-with-fmt-exception
@@ -0,0 +1,27 @@
+Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--- Optional exception to the license ---
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into a machine-executable object form of such
+source code, you may redistribute such embedded portions in such object form
+without including the above copyright and permission notices.
-- 
2.47.3

[PATCH 03/45] acl: upgrade 2.3.2 -> 2.4.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Backport a patch to tar to avoid name clashes.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...0001-Avoid-acl_-prefix-for-functions.patch | 90 +++++++++++++++++++
 meta/recipes-extended/tar/tar_1.35.bb         | 22 ++---
 ...t_uid-fix-memory-wasting-loop-if-use.patch | 49 ----------
 ...isc.test-Don-t-mix-stdout-and-stderr.patch | 35 --------
 .../attr/{acl_2.3.2.bb => acl_2.4.0.bb}       |  4 +-
 5 files changed, 102 insertions(+), 98 deletions(-)
 create mode 100644 meta/recipes-extended/tar/tar/0001-Avoid-acl_-prefix-for-functions.patch
 delete mode 100644 meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch
 delete mode 100644 meta/recipes-support/attr/acl/0001-test-misc.test-Don-t-mix-stdout-and-stderr.patch
 rename meta/recipes-support/attr/{acl_2.3.2.bb => acl_2.4.0.bb} (90%)

diff --git a/meta/recipes-extended/tar/tar/0001-Avoid-acl_-prefix-for-functions.patch b/meta/recipes-extended/tar/tar/0001-Avoid-acl_-prefix-for-functions.patch
new file mode 100644
index 0000000000..a736d5f229
--- /dev/null
+++ b/meta/recipes-extended/tar/tar/0001-Avoid-acl_-prefix-for-functions.patch
@@ -0,0 +1,90 @@
+From 78a6e620515a0ca7e3481a9d8277225c800262a7 Mon Sep 17 00:00:00 2001
+From: Pavel Cahyna <pcahyna@redhat.com>
+Date: Wed, 24 Jun 2026 18:45:30 +0200
+Subject: [PATCH] Avoid acl_ prefix for functions
+
+The acl.h header from libacl uses acl_ prefix for its functions. Avoid
+defining functions with the same name in order to protect its namespace.
+
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/tar.git/commit/?id=08c3fc2e9337094aff01a511170fd35fdb8f1ee3]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/xattrs.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/xattrs.c b/src/xattrs.c
+index 86a7e59..bf2c4f0 100644
+--- a/src/xattrs.c
++++ b/src/xattrs.c
+@@ -139,13 +139,13 @@ static struct
+ #ifdef HAVE_POSIX_ACLS
+ 
+ /* acl-at wrappers, TODO: move to gnulib in future? */
+-static acl_t acl_get_file_at (int, const char *, acl_type_t);
+-static int acl_set_file_at (int, const char *, acl_type_t, acl_t);
++static acl_t tar_acl_get_file_at (int, const char *, acl_type_t);
++static int tar_acl_set_file_at (int, const char *, acl_type_t, acl_t);
+ static int file_has_acl_at (int, char const *, struct stat const *);
+-static int acl_delete_def_file_at (int, char const *);
++static int tar_acl_delete_def_file_at (int, char const *);
+ 
+-/* acl_get_file_at */
+-#define AT_FUNC_NAME acl_get_file_at
++/* tar_acl_get_file_at */
++#define AT_FUNC_NAME tar_acl_get_file_at
+ #define AT_FUNC_RESULT acl_t
+ #define AT_FUNC_FAIL (acl_t)NULL
+ #define AT_FUNC_F1 acl_get_file
+@@ -159,8 +159,8 @@ static int acl_delete_def_file_at (int, char const *);
+ #undef AT_FUNC_POST_FILE_PARAM_DECLS
+ #undef AT_FUNC_POST_FILE_ARGS
+ 
+-/* acl_set_file_at */
+-#define AT_FUNC_NAME acl_set_file_at
++/* tar_acl_set_file_at */
++#define AT_FUNC_NAME tar_acl_set_file_at
+ #define AT_FUNC_F1 acl_set_file
+ #define AT_FUNC_POST_FILE_PARAM_DECLS   , acl_type_t type, acl_t acl
+ #define AT_FUNC_POST_FILE_ARGS          , type, acl
+@@ -170,8 +170,8 @@ static int acl_delete_def_file_at (int, char const *);
+ #undef AT_FUNC_POST_FILE_PARAM_DECLS
+ #undef AT_FUNC_POST_FILE_ARGS
+ 
+-/* acl_delete_def_file_at */
+-#define AT_FUNC_NAME acl_delete_def_file_at
++/* tar_acl_delete_def_file_at */
++#define AT_FUNC_NAME tar_acl_delete_def_file_at
+ #define AT_FUNC_F1 acl_delete_def_file
+ #define AT_FUNC_POST_FILE_PARAM_DECLS
+ #define AT_FUNC_POST_FILE_ARGS
+@@ -299,7 +299,7 @@ xattrs__acls_set (struct tar_stat_info const *st,
+       /* No "default" IEEE 1003.1e ACL set for directory.  At this moment,
+          FILE_NAME may already have inherited default acls from parent
+          directory;  clean them up. */
+-      if (acl_delete_def_file_at (chdir_fd, file_name))
++      if (tar_acl_delete_def_file_at (chdir_fd, file_name))
+         WARNOPT (WARN_XATTR_WRITE,
+                 (0, errno,
+                  _("acl_delete_def_file_at: Cannot drop default POSIX ACLs "
+@@ -316,7 +316,7 @@ xattrs__acls_set (struct tar_stat_info const *st,
+       return;
+     }
+ 
+-  if (acl_set_file_at (chdir_fd, file_name, type, acl) == -1)
++  if (tar_acl_set_file_at (chdir_fd, file_name, type, acl) == -1)
+     /* warn even if filesystem does not support acls */
+     WARNOPT (WARN_XATTR_WRITE,
+ 	     (0, errno,
+@@ -357,10 +357,10 @@ acls_get_text (int parentfd, const char *file_name, acl_type_t type,
+   char *val = NULL;
+   acl_t acl;
+ 
+-  if (!(acl = acl_get_file_at (parentfd, file_name, type)))
++  if (!(acl = tar_acl_get_file_at (parentfd, file_name, type)))
+     {
+       if (errno != ENOTSUP)
+-        call_arg_warn ("acl_get_file_at", file_name);
++        call_arg_warn ("tar_acl_get_file_at", file_name);
+       return;
+     }
+ 
diff --git a/meta/recipes-extended/tar/tar_1.35.bb b/meta/recipes-extended/tar/tar_1.35.bb
index d15e7f8a4e..eb71863231 100644
--- a/meta/recipes-extended/tar/tar_1.35.bb
+++ b/meta/recipes-extended/tar/tar_1.35.bb
@@ -6,7 +6,17 @@ SECTION = "base"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
+SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
+           file://run-ptest \
+           file://0001-tests-fix-TESTSUITE_AT.patch \
+           file://0002-tests-check-for-recently-fixed-bug.patch \
+           file://0003-Exclude-VCS-directory-with-writing-from-an-archive.patch \
+           file://CVE-2026-5704-dependent_p1.patch \
+           file://CVE-2026-5704-dependent_p2.patch \
+           file://CVE-2026-5704.patch \
+           file://CVE-2026-5704-regression.patch \
+           file://0001-Avoid-acl_-prefix-for-functions.patch \
+           "
 
 SRC_URI[sha256sum] = "7edb8886a3dc69420a1446e1e2d061922b642f1cf632d2cd0f9ee7e690775985"
 
@@ -37,16 +47,6 @@ do_install:append:class-target() {
 }
 
 # add for ptest support
-SRC_URI += " \
-    file://run-ptest \
-    file://0001-tests-fix-TESTSUITE_AT.patch \
-    file://0002-tests-check-for-recently-fixed-bug.patch \
-    file://0003-Exclude-VCS-directory-with-writing-from-an-archive.patch \
-    file://CVE-2026-5704-dependent_p1.patch \
-    file://CVE-2026-5704-dependent_p2.patch \
-    file://CVE-2026-5704.patch \
-    file://CVE-2026-5704-regression.patch \
-"
 
 inherit ptest
 
diff --git a/meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch b/meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch
deleted file mode 100644
index 5052bdaa2f..0000000000
--- a/meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 56abe432b65801f31277fb9a3bca0f9e31502315 Mon Sep 17 00:00:00 2001
-From: Matthias Gerstner <matthias.gerstner@suse.de>
-Date: Thu, 25 Apr 2024 12:43:49 +0200
-Subject: [PATCH] libmisc: __acl_get_uid(): fix memory wasting loop if user
- does not exist
-
-I noticed that `acl_from_text()` unexpectedly returns ENOMEM for invalid
-user names. The reason for this is a missing break statement in the for
-loop in `__acl_get_uid()`, which causes the loop to act as if ERANGE was
-returned from `getpwnam_r()`, thereby exponentially increasing the
-buffer size to (in my case) multiple gigabytes, until `grow_buffer()`
-reports ENOMEM, which terminates the `__acl_get_uid()` function.
-
-This is a pretty costly "no such user" lookup that can disturb a
-process's heap memory management, but can also cause a process to fail
-e.g. if it is multithreaded and other threads encounter an ENOMEM,
-before `__acl_get_uid()` frees the gigantic heap buffer and returns.
-The allocated memory isn't actually used. Therefore on Linux it should
-not affect other processes by default, due to its overcommit memory
-and lazy memory allocation strategy.
-
-Fix this by properly terminating the for loop on any conditions except
-an ERANGE error being reported. The same break statement correctly
-exists in `__acl_get_gid()` already.
-
-Fixes: 3737f00 ("use thread-safe getpwnam_r and getgrnam_r")
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- libmisc/uid_gid_lookup.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libmisc/uid_gid_lookup.c b/libmisc/uid_gid_lookup.c
-index a4f21f6..74baab4 100644
---- a/libmisc/uid_gid_lookup.c
-+++ b/libmisc/uid_gid_lookup.c
-@@ -91,6 +91,7 @@ __acl_get_uid(const char *token, uid_t *uid_p)
- 		if (err == ERANGE)
- 			continue;
- 		errno = err ? err : EINVAL;
-+		break;
- 	}
- 	free(buffer);
- 	return result ? 0 : -1;
--- 
-2.43.0
-
diff --git a/meta/recipes-support/attr/acl/0001-test-misc.test-Don-t-mix-stdout-and-stderr.patch b/meta/recipes-support/attr/acl/0001-test-misc.test-Don-t-mix-stdout-and-stderr.patch
deleted file mode 100644
index 5aa3f3224c..0000000000
--- a/meta/recipes-support/attr/acl/0001-test-misc.test-Don-t-mix-stdout-and-stderr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 47f8039ec9bd08b629775c8e788d11e41fa95f14 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 24 Mar 2025 21:14:09 +0100
-Subject: [PATCH] test/misc.test: Don't mix stdout and stderr
-
-In different environments, we may not get the stdout and stderr output
-in the order the run script expects, so check both separately.
-
-Fixes: https://savannah.nongnu.org/bugs/?66944
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- test/misc.test | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/misc.test b/test/misc.test
-index 06b3136..57c02e5 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -440,8 +440,9 @@ Dangling symlink test https://savannah.nongnu.org/bugs/?28131
- 	> other::r-x
- 	> 
- 	$ setfacl -R -m u:bin:rw d
--	$ getfacl -RL d
-+	$ getfacl -RL d > /dev/null
- 	> getfacl: d/b: No such file or directory
-+	$ getfacl -RL d 2> /dev/null
- 	> # file: d
- 	> # owner: %TUSER
- 	> # group: %TGROUP
--- 
-2.43.0
-
diff --git a/meta/recipes-support/attr/acl_2.3.2.bb b/meta/recipes-support/attr/acl_2.4.0.bb
similarity index 90%
rename from meta/recipes-support/attr/acl_2.3.2.bb
rename to meta/recipes-support/attr/acl_2.4.0.bb
index a405cc2692..ef9ee492a0 100644
--- a/meta/recipes-support/attr/acl_2.3.2.bb
+++ b/meta/recipes-support/attr/acl_2.4.0.bb
@@ -16,11 +16,9 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
 DEPENDS = "attr"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \
-           file://0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch \
-           file://0001-test-misc.test-Don-t-mix-stdout-and-stderr.patch \
            file://run-ptest \
            "
-SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c"
+SRC_URI[sha256sum] = "73c853c3d44e1f693e5a96a986f1bd19d3d0dac2c7d453e796177774bc4e5f6a"
 
 inherit autotools gettext ptest
 
-- 
2.47.3

[PATCH 04/45] appstream: upgrade 1.1.2 -> 1.1.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Disable manpages (and remove related dependencies), as upstream
has converted them to docbook 5, which oe-core does not provide.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../appstream/0001-remove-hardcoded-path.patch       |  4 ++--
 .../appstream/0002-Do-not-build-qt-tests.patch       |  5 +----
 ...GE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch |  2 +-
 .../{appstream_1.1.2.bb => appstream_1.1.3.bb}       | 12 +++---------
 4 files changed, 7 insertions(+), 16 deletions(-)
 rename meta/recipes-support/appstream/{appstream_1.1.2.bb => appstream_1.1.3.bb} (85%)

diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
index 5f4ec29628..56a5479099 100644
--- a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
+++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch
@@ -1,4 +1,4 @@
-From e713f4d6ce2ee198eabcc31bc734e84cdb20ea32 Mon Sep 17 00:00:00 2001
+From bf79c20cfee4a074ca752a1466dc96d0b9eb6175 Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Mon, 12 Dec 2022 15:42:42 +0100
 Subject: [PATCH] remove hardcoded path
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [oe-specific]
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index ee5b179..8a06e75 100644
+index 9af5f58..ad1483d 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -194,10 +194,10 @@ endif
diff --git a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch
index f6bbdd180a..3e666181eb 100644
--- a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch
+++ b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch
@@ -1,4 +1,4 @@
-From 5763a61ca9aff2e2383c1eeb1ef3f5e6cd07c539 Mon Sep 17 00:00:00 2001
+From 1a1619dce3c3fa54fa5f47f7ed89447e0805de43 Mon Sep 17 00:00:00 2001
 From: Marc Ferland <marc.ferland@sonatest.com>
 Date: Fri, 26 Jul 2024 15:41:00 -0400
 Subject: [PATCH] Do not build qt/tests
@@ -32,6 +32,3 @@ index 407a57a..840c838 100644
  )
 -
 -subdir('tests/')
--- 
-2.34.1
-
diff --git a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch
index d1994e3c4c..8ba4de95c9 100644
--- a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch
+++ b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch
@@ -1,4 +1,4 @@
-From f19365d8b90cde7d2a385f8c85b74a2565ff25fa Mon Sep 17 00:00:00 2001
+From 4fdd29346b51eea577ee46c7166348dad19bbcb0 Mon Sep 17 00:00:00 2001
 From: Marc Ferland <marc.ferland@sonatest.com>
 Date: Mon, 29 Jul 2024 09:35:51 -0400
 Subject: [PATCH] Fix PACKAGE_PREFIX_DIR in qt/cmake/AppStreamQtConfig.cmake.in
diff --git a/meta/recipes-support/appstream/appstream_1.1.2.bb b/meta/recipes-support/appstream/appstream_1.1.3.bb
similarity index 85%
rename from meta/recipes-support/appstream/appstream_1.1.2.bb
rename to meta/recipes-support/appstream/appstream_1.1.3.bb
index c6ec0fff0a..06e4f7940a 100644
--- a/meta/recipes-support/appstream/appstream_1.1.2.bb
+++ b/meta/recipes-support/appstream/appstream_1.1.3.bb
@@ -5,18 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21"
 
 DEPENDS = " \
     appstream-native \
-    curl-native \
     curl \
-    docbook-xml-dtd4-native \
     gperf-native \
-    glib-2.0 \
+    itstool-native \
     libfyaml \
     libxml2 \
     libxmlb \
-    libxslt-native \
-    itstool-native \
-    docbook-xsl-stylesheets-native \
-    python3-pygments-native \
 "
 
 inherit meson gobject-introspection gettext gi-docgen pkgconfig vala bash-completion
@@ -30,7 +24,7 @@ SRC_URI = " \
 	file://0002-Do-not-build-qt-tests.patch \
 	file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \
 "
-SRC_URI[sha256sum] = "46b4257100e25a6468ceed7b3ab82441f47b119da3398d30aea6d7b91174b586"
+SRC_URI[sha256sum] = "2624f967068427edc94f3979edae3571bb077063f5bc231f737776da527bf467"
 
 S = "${UNPACKDIR}/AppStream-${PV}"
 
@@ -44,7 +38,7 @@ PACKAGECONFIG[bash-completion] = "-Dbash-completion=true,-Dbash-completion=false
 
 FILES:${PN} += "${datadir}"
 
-EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
+EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} -Dman=false"
 
 BBCLASSEXTEND = "native"
 
-- 
2.47.3

[PATCH 05/45] at-spi2-core: upgrade 2.60.4 -> 2.60.5

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../atk/{at-spi2-core_2.60.4.bb => at-spi2-core_2.60.5.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/atk/{at-spi2-core_2.60.4.bb => at-spi2-core_2.60.5.bb} (94%)

diff --git a/meta/recipes-support/atk/at-spi2-core_2.60.4.bb b/meta/recipes-support/atk/at-spi2-core_2.60.5.bb
similarity index 94%
rename from meta/recipes-support/atk/at-spi2-core_2.60.4.bb
rename to meta/recipes-support/atk/at-spi2-core_2.60.5.bb
index 9472e06b1d..b53a0e0795 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.60.4.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.60.5.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 CVE_PRODUCT += "at-spi2-atk"
 
-SRC_URI[archive.sha256sum] = "1a1f5ba9805917f41fc6aa6823dcf887a291d607a427e2d5afb6b5dfa65070c7"
+SRC_URI[archive.sha256sum] = "6059a77d507438ff6c8d6d06025f8f9f5774fa0f8eabe9c9b059b1cc41e1bbc0"
 
 DEPENDS = " \
 	dbus \
-- 
2.47.3

[PATCH 06/45] attr: upgrade 2.5.2 -> 2.6.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop patch (issue fixed upstream).

Adjust file names in ptest packaging.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ibgen.h-for-posix-version-of-basenam.patch | 35 -------------------
 meta/recipes-support/attr/attr/run-ptest      |  2 +-
 .../attr/{attr_2.5.2.bb => attr_2.6.0.bb}     |  7 ++--
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch
 rename meta/recipes-support/attr/{attr_2.5.2.bb => attr_2.6.0.bb} (88%)

diff --git a/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch b/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch
deleted file mode 100644
index 1e2bea5067..0000000000
--- a/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6d9e827bcacf387bb3cfae64bd4fe520168ccad4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Dec 2023 19:29:27 -0800
-Subject: [PATCH] attr.c: Include libgen.h for posix version of basename API
-
-Musl has removed the definition from string.h [1] which results in
-compile failures with clang
-
-| ../attr-2.5.1/tools/attr.c:69:13: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-|    69 |         progname = basename(argv[0]);
-|       |                    ^
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://savannah.nongnu.org/bugs/index.php?64972]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/attr.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/attr.c b/tools/attr.c
-index 312aef1..90dab83 100644
---- a/tools/attr.c
-+++ b/tools/attr.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <libgen.h>
- #include <string.h>
- #include <locale.h>
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest
index 028671a9bd..50970d5b65 100644
--- a/meta/recipes-support/attr/attr/run-ptest
+++ b/meta/recipes-support/attr/attr/run-ptest
@@ -3,7 +3,7 @@
 failed=0
 all=0
 
-for f in *.test; do
+for f in *.run; do
     ./run $f
     case "$?" in
         0)
diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.6.0.bb
similarity index 88%
rename from meta/recipes-support/attr/attr_2.5.2.bb
rename to meta/recipes-support/attr/attr_2.6.0.bb
index 390445b959..aa5e7eb98f 100644
--- a/meta/recipes-support/attr/attr_2.5.2.bb
+++ b/meta/recipes-support/attr/attr_2.6.0.bb
@@ -16,10 +16,9 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
            file://run-ptest \
-           file://0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch \
 "
 
-SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87"
+SRC_URI[sha256sum] = "d42fa374513180bb48cb11a46696f488240e5124ff1e6ad88b0abff706985612"
 
 inherit ptest update-alternatives autotools gettext
 
@@ -35,7 +34,7 @@ ALTERNATIVE_TARGET[getfattr] = "${bindir}/getfattr"
 do_install_ptest() {
     install -m755 ${S}/test/run ${S}/test/sort-getfattr-output ${D}${PTEST_PATH}/
 
-    for t in $(makefile-getvar ${S}/test/Makemodule.am TESTS); do
+    for t in $(makefile-getvar ${B}/Makefile TESTS); do
         install -m644 ${S}/$t ${D}${PTEST_PATH}/
     done
 }
@@ -44,7 +43,7 @@ do_install_ptest:append:libc-musl() {
     # With glibc strerror(ENOTSUP) is "Operation not supported" but
     # musl is "Not supported".
     # https://savannah.nongnu.org/bugs/?62370
-    sed -i -e 's|f: Operation not supported|f: Not supported|g' ${D}${PTEST_PATH}/attr.test
+    sed -i -e 's|f: Operation not supported|f: Not supported|g' ${D}${PTEST_PATH}/attr.run
 }
 
 RDEPENDS:${PN}-ptest = "attr \
-- 
2.47.3

[PATCH 07/45] barebox-tools: upgrade 2026.06.0 -> 2026.06.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-bsp/barebox/barebox-common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/barebox/barebox-common.inc b/meta/recipes-bsp/barebox/barebox-common.inc
index 6467ed3653..2a42c0a266 100644
--- a/meta/recipes-bsp/barebox/barebox-common.inc
+++ b/meta/recipes-bsp/barebox/barebox-common.inc
@@ -3,6 +3,6 @@ SECTION = "bootloaders"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192"
 
-PV = "2026.06.0"
+PV = "2026.06.1"
 SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "521b427efe4d5199641fd6440ed77226fed3ba7088ee2f6361b510187f700f09"
+SRC_URI[sha256sum] = "8752b3752819ec4aaf848a1d06df05242a64954525fb15b6cf07b3c3dd7ebd7f"
-- 
2.47.3

[PATCH 08/45] cmake: upgrade 4.3.3 -> 4.3.4

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../cmake/{cmake-native_4.3.3.bb => cmake-native_4.3.4.bb}      | 0
 meta/recipes-devtools/cmake/cmake.inc                           | 2 +-
 meta/recipes-devtools/cmake/{cmake_4.3.3.bb => cmake_4.3.4.bb}  | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/cmake/{cmake-native_4.3.3.bb => cmake-native_4.3.4.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_4.3.3.bb => cmake_4.3.4.bb} (100%)

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.3.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.3.4.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_4.3.3.bb
rename to meta/recipes-devtools/cmake/cmake-native_4.3.4.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index f183f823e3..f08b0715ba 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "cba4bb7a44edf2877bb6f059932896383babe435b3a8c3b5df48b4aa41c9bb85"
+SRC_URI[sha256sum] = "fdeff897b9eb49d764539f2b1edc6eb7e1440df325678a97c1978499e931adda"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
diff --git a/meta/recipes-devtools/cmake/cmake_4.3.3.bb b/meta/recipes-devtools/cmake/cmake_4.3.4.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_4.3.3.bb
rename to meta/recipes-devtools/cmake/cmake_4.3.4.bb
-- 
2.47.3

[PATCH 09/45] expat: upgrade 2.8.1 -> 2.8.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/expat/{expat_2.8.1.bb => expat_2.8.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/expat/{expat_2.8.1.bb => expat_2.8.2.bb} (92%)

diff --git a/meta/recipes-core/expat/expat_2.8.1.bb b/meta/recipes-core/expat/expat_2.8.2.bb
similarity index 92%
rename from meta/recipes-core/expat/expat_2.8.1.bb
rename to meta/recipes-core/expat/expat_2.8.2.bb
index fa48d42bf8..0b9dbe161b 100644
--- a/meta/recipes-core/expat/expat_2.8.1.bb
+++ b/meta/recipes-core/expat/expat_2.8.2.bb
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2  \
 GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/"
 UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)"
 
-SRC_URI[sha256sum] = "f5833dd2e1cd7739ec9182804a1a29c4f0cc7c2f26b633d3a2188b7766a88ecb"
+SRC_URI[sha256sum] = "69e7f52417d85b1c2b7fe855e176eec55d0b2d7d92d691372d833a1c7df7923b"
 
 EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
 
-- 
2.47.3

[PATCH 10/45] fmt: upgrade 12.1.0 -> 12.2.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

License-Update: clarify presence of fmt exception:
https://github.com/fmtlib/fmt/commit/91d1aced0a846161135310249664506b4a56e196

Backport a patch to address 32 bit x86 fails (which do not have a native int128 type).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ix-fallback-uint128-bitwise-not-4813.patch | 42 +++++++++++++++++++
 ...01-Workaround-an-ABI-issue-in-spdlog.patch |  8 ++--
 .../fmt/{fmt_12.1.0.bb => fmt_12.2.0.bb}      | 10 +++--
 3 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
 rename meta/recipes-devtools/fmt/{fmt_12.1.0.bb => fmt_12.2.0.bb} (60%)

diff --git a/meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch b/meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
new file mode 100644
index 0000000000..ef5c6e9f82
--- /dev/null
+++ b/meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
@@ -0,0 +1,42 @@
+From d838c8c7923730afb751350ecac2b169256f1445 Mon Sep 17 00:00:00 2001
+From: Vinay Kumar <vkslog69@gmail.com>
+Date: Thu, 18 Jun 2026 12:22:12 +0530
+Subject: [PATCH] Fix fallback uint128 bitwise not (#4813)
+
+Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/588b3a0f8f6a8bcf2a959cae882d5b2703e86737]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ include/fmt/format.h | 3 +++
+ test/format-test.cc  | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/include/fmt/format.h b/include/fmt/format.h
+index f33c8b87..ca95f6df 100644
+--- a/include/fmt/format.h
++++ b/include/fmt/format.h
+@@ -326,6 +326,9 @@ class uint128 {
+       -> uint128 {
+     return {lhs.hi_ & rhs.hi_, lhs.lo_ & rhs.lo_};
+   }
++  friend constexpr auto operator~(const uint128& n) -> uint128 {
++    return {~n.hi_, ~n.lo_};
++  }
+   friend FMT_CONSTEXPR auto operator+(const uint128& lhs, const uint128& rhs)
+       -> uint128 {
+     auto result = uint128(lhs);
+diff --git a/test/format-test.cc b/test/format-test.cc
+index 61a53c72..7e48b751 100644
+--- a/test/format-test.cc
++++ b/test/format-test.cc
+@@ -81,6 +81,11 @@ TEST(uint128_test, minus) {
+   EXPECT_EQ(n - 2, 40);
+ }
+ 
++TEST(uint128_test, bitwise_not) {
++  auto n = ~uint128(0x123456789abcdef0, 0x0fedcba987654321);
++  EXPECT_EQ(n, uint128(0xedcba9876543210f, 0xf0123456789abcde));
++}
++
+ TEST(uint128_test, plus_assign) {
+   auto n = uint128(32);
+   n += uint128(10);
diff --git a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
index 442506f834..afae644d49 100644
--- a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
+++ b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
@@ -1,4 +1,4 @@
-From 32f4a4a634c99d4e00cc6149786a9180ad651f76 Mon Sep 17 00:00:00 2001
+From 6ee6b54766c50ae8df9478efd91075543e89f66e Mon Sep 17 00:00:00 2001
 From: Victor Zverovich <viz@meta.com>
 Date: Sat, 22 Mar 2025 06:57:04 -0700
 Subject: [PATCH] Workaround an ABI issue in spdlog
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4a653007..82f80efd 100644
+index 5044befd..f33c8b87 100644
 --- a/include/fmt/format.h
 +++ b/include/fmt/format.h
-@@ -793,7 +793,9 @@ enum { inline_buffer_size = 500 };
+@@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 };
   * converted to `std::string` with `to_string(out)`.
   */
  template <typename T, size_t SIZE = inline_buffer_size,
@@ -24,7 +24,7 @@ index 4a653007..82f80efd 100644
  class basic_memory_buffer : public detail::buffer<T> {
   private:
    T store_[SIZE];
-@@ -2746,7 +2748,7 @@ class bigint {
+@@ -2769,7 +2771,7 @@ class bigint {
    }
  
   public:
diff --git a/meta/recipes-devtools/fmt/fmt_12.1.0.bb b/meta/recipes-devtools/fmt/fmt_12.2.0.bb
similarity index 60%
rename from meta/recipes-devtools/fmt/fmt_12.1.0.bb
rename to meta/recipes-devtools/fmt/fmt_12.2.0.bb
index 22cab6f138..ca8fcb66ec 100644
--- a/meta/recipes-devtools/fmt/fmt_12.1.0.bb
+++ b/meta/recipes-devtools/fmt/fmt_12.2.0.bb
@@ -1,14 +1,16 @@
 SUMMARY = "open-source formatting library for C++"
 DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams."
 HOMEPAGE = "https://fmt.dev"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
+LICENSE = "MIT-with-fmt-exception"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec080902ed8f82f5a97ed13e8042634 \
+                    file://doc/LICENSE-exception;md5=b9257785fc4f3803a4b71b76c1412729"
 
-SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV} \
+SRC_URI = "git://github.com/fmtlib/fmt;branch=main;protocol=https;tag=${PV} \
            file://0001-Workaround-an-ABI-issue-in-spdlog.patch \
            file://run-ptest \
+           file://0001-Fix-fallback-uint128-bitwise-not-4813.patch \
            "
-SRCREV = "407c905e45ad75fc29bf0f9bb7c5c2fd3475976f"
+SRCREV = "1be298e1bd68957e4cd352e1f676f00e07dcfb57"
 
 inherit cmake ptest
 
-- 
2.47.3

Re: [OE-core] [PATCH 10/45] fmt: upgrade 12.1.0 -> 12.2.0

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 6668 bytes --]

This has several packages broken currently left with
https://errors.yoctoproject.org/Errors/Build/242285/
but I wonder if common fmt is a recommended way or should we let vendored
versions be used.

On Mon, Jul 6, 2026 at 10:17 AM Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> From: Alexander Kanavin <alex@linutronix.de>
>
> License-Update: clarify presence of fmt exception:
>
> https://github.com/fmtlib/fmt/commit/91d1aced0a846161135310249664506b4a56e196
>
> Backport a patch to address 32 bit x86 fails (which do not have a native
> int128 type).
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...ix-fallback-uint128-bitwise-not-4813.patch | 42 +++++++++++++++++++
>  ...01-Workaround-an-ABI-issue-in-spdlog.patch |  8 ++--
>  .../fmt/{fmt_12.1.0.bb => fmt_12.2.0.bb}      | 10 +++--
>  3 files changed, 52 insertions(+), 8 deletions(-)
>  create mode 100644
> meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
>  rename meta/recipes-devtools/fmt/{fmt_12.1.0.bb => fmt_12.2.0.bb} (60%)
>
> diff --git
> a/meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
> b/meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
> new file mode 100644
> index 0000000000..ef5c6e9f82
> --- /dev/null
> +++
> b/meta/recipes-devtools/fmt/fmt/0001-Fix-fallback-uint128-bitwise-not-4813.patch
> @@ -0,0 +1,42 @@
> +From d838c8c7923730afb751350ecac2b169256f1445 Mon Sep 17 00:00:00 2001
> +From: Vinay Kumar <vkslog69@gmail.com>
> +Date: Thu, 18 Jun 2026 12:22:12 +0530
> +Subject: [PATCH] Fix fallback uint128 bitwise not (#4813)
> +
> +Upstream-Status: Backport [
> https://github.com/fmtlib/fmt/commit/588b3a0f8f6a8bcf2a959cae882d5b2703e86737
> ]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + include/fmt/format.h | 3 +++
> + test/format-test.cc  | 5 +++++
> + 2 files changed, 8 insertions(+)
> +
> +diff --git a/include/fmt/format.h b/include/fmt/format.h
> +index f33c8b87..ca95f6df 100644
> +--- a/include/fmt/format.h
> ++++ b/include/fmt/format.h
> +@@ -326,6 +326,9 @@ class uint128 {
> +       -> uint128 {
> +     return {lhs.hi_ & rhs.hi_, lhs.lo_ & rhs.lo_};
> +   }
> ++  friend constexpr auto operator~(const uint128& n) -> uint128 {
> ++    return {~n.hi_, ~n.lo_};
> ++  }
> +   friend FMT_CONSTEXPR auto operator+(const uint128& lhs, const uint128&
> rhs)
> +       -> uint128 {
> +     auto result = uint128(lhs);
> +diff --git a/test/format-test.cc b/test/format-test.cc
> +index 61a53c72..7e48b751 100644
> +--- a/test/format-test.cc
> ++++ b/test/format-test.cc
> +@@ -81,6 +81,11 @@ TEST(uint128_test, minus) {
> +   EXPECT_EQ(n - 2, 40);
> + }
> +
> ++TEST(uint128_test, bitwise_not) {
> ++  auto n = ~uint128(0x123456789abcdef0, 0x0fedcba987654321);
> ++  EXPECT_EQ(n, uint128(0xedcba9876543210f, 0xf0123456789abcde));
> ++}
> ++
> + TEST(uint128_test, plus_assign) {
> +   auto n = uint128(32);
> +   n += uint128(10);
> diff --git
> a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
> b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
> index 442506f834..afae644d49 100644
> ---
> a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
> +++
> b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
> @@ -1,4 +1,4 @@
> -From 32f4a4a634c99d4e00cc6149786a9180ad651f76 Mon Sep 17 00:00:00 2001
> +From 6ee6b54766c50ae8df9478efd91075543e89f66e Mon Sep 17 00:00:00 2001
>  From: Victor Zverovich <viz@meta.com>
>  Date: Sat, 22 Mar 2025 06:57:04 -0700
>  Subject: [PATCH] Workaround an ABI issue in spdlog
> @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
>  diff --git a/include/fmt/format.h b/include/fmt/format.h
> -index 4a653007..82f80efd 100644
> +index 5044befd..f33c8b87 100644
>  --- a/include/fmt/format.h
>  +++ b/include/fmt/format.h
> -@@ -793,7 +793,9 @@ enum { inline_buffer_size = 500 };
> +@@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 };
>    * converted to `std::string` with `to_string(out)`.
>    */
>   template <typename T, size_t SIZE = inline_buffer_size,
> @@ -24,7 +24,7 @@ index 4a653007..82f80efd 100644
>   class basic_memory_buffer : public detail::buffer<T> {
>    private:
>     T store_[SIZE];
> -@@ -2746,7 +2748,7 @@ class bigint {
> +@@ -2769,7 +2771,7 @@ class bigint {
>     }
>
>    public:
> diff --git a/meta/recipes-devtools/fmt/fmt_12.1.0.bb
> b/meta/recipes-devtools/fmt/fmt_12.2.0.bb
> similarity index 60%
> rename from meta/recipes-devtools/fmt/fmt_12.1.0.bb
> rename to meta/recipes-devtools/fmt/fmt_12.2.0.bb
> index 22cab6f138..ca8fcb66ec 100644
> --- a/meta/recipes-devtools/fmt/fmt_12.1.0.bb
> +++ b/meta/recipes-devtools/fmt/fmt_12.2.0.bb
> @@ -1,14 +1,16 @@
>  SUMMARY = "open-source formatting library for C++"
>  DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can
> be used as a safe and fast alternative to (s)printf and iostreams."
>  HOMEPAGE = "https://fmt.dev"
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
> +LICENSE = "MIT-with-fmt-exception"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec080902ed8f82f5a97ed13e8042634 \
> +
> file://doc/LICENSE-exception;md5=b9257785fc4f3803a4b71b76c1412729"
>
> -SRC_URI = "git://
> github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV}
> <http://github.com/fmtlib/fmt;branch=master;protocol=https;tag=$%7BPV%7D>
> \
> +SRC_URI = "git://
> github.com/fmtlib/fmt;branch=main;protocol=https;tag=${PV}
> <http://github.com/fmtlib/fmt;branch=main;protocol=https;tag=$%7BPV%7D> \
>             file://0001-Workaround-an-ABI-issue-in-spdlog.patch \
>             file://run-ptest \
> +           file://0001-Fix-fallback-uint128-bitwise-not-4813.patch \
>             "
> -SRCREV = "407c905e45ad75fc29bf0f9bb7c5c2fd3475976f"
> +SRCREV = "1be298e1bd68957e4cd352e1f676f00e07dcfb57"
>
>  inherit cmake ptest
>
> --
> 2.47.3
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#240296):
> https://lists.openembedded.org/g/openembedded-core/message/240296
> Mute This Topic: https://lists.openembedded.org/mt/120143430/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 9482 bytes --]

[PATCH 11/45] git: upgrade 2.54.0 -> 2.55.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

License-Update: drop BSL-1.0 as sub-component that used it is no longer in source tree.

Disable building items written in rust (until now, git would quetly fall
back to C by default, as of this version it no longer does). At some point rust
code will have to be enabled; for now it's optional.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-do-not-force-RHEL-7-specific-build-.patch | 33 -------------------
 meta/recipes-devtools/git/git/fixsort.patch   |  2 +-
 .../git/{git_2.54.0.bb => git_2.55.0.bb}      |  8 ++---
 3 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
 rename meta/recipes-devtools/git/{git_2.54.0.bb => git_2.55.0.bb} (94%)

diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
deleted file mode 100644
index b0c8e652aa..0000000000
--- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d73b4c666aa12452a26c3fac83371a707e6f13c0 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 7 Feb 2022 10:13:15 +0100
-Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings
-
-This breaks reproducibility as git builds on centos 7 use
-different flags than git builds on other host distros.
-
-Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
-Rebased for 2.45.1.
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- config.mak.uname | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/config.mak.uname b/config.mak.uname
-index 5feb582..060cd29 100644
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -63,10 +63,6 @@ ifeq ($(uname_S),Linux)
- 	PROCFS_EXECUTABLE_PATH = /proc/self/exe
- 	HAVE_PLATFORM_PROCINFO = YesPlease
- 	COMPAT_OBJS += compat/linux/procinfo.o
--	# centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
--        ifneq ($(findstring .el7.,$(uname_R)),)
--		BASIC_CFLAGS += -std=c99
--        endif
- 	LINK_FUZZ_PROGRAMS = YesPlease
- endif
- ifeq ($(uname_S),GNU/kFreeBSD)
diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch
index 046d09160a..86b41fd819 100644
--- a/meta/recipes-devtools/git/git/fixsort.patch
+++ b/meta/recipes-devtools/git/git/fixsort.patch
@@ -1,4 +1,4 @@
-From f928abf16841e42bfd49ccaabc164318f61e842a Mon Sep 17 00:00:00 2001
+From e3bdf5adc50b12d8625e70415c81402e0e938b68 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Wed, 17 Feb 2021 17:57:13 +0000
 Subject: [PATCH] generate-configlist.sh: Fix determinism issue
diff --git a/meta/recipes-devtools/git/git_2.54.0.bb b/meta/recipes-devtools/git/git_2.55.0.bb
similarity index 94%
rename from meta/recipes-devtools/git/git_2.54.0.bb
rename to meta/recipes-devtools/git/git_2.55.0.bb
index 80c535a726..9198bb06c9 100644
--- a/meta/recipes-devtools/git/git_2.54.0.bb
+++ b/meta/recipes-devtools/git/git_2.55.0.bb
@@ -2,14 +2,13 @@ SUMMARY = "Distributed version control system"
 HOMEPAGE = "http://git-scm.com"
 DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
 SECTION = "console/utils"
-LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & BSL-1.0 & LGPL-2.1-or-later"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & LGPL-2.1-or-later"
 DEPENDS = "openssl zlib"
 
 PROVIDES:append:class-native = " git-replacement-native"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
            file://fixsort.patch \
-           file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
@@ -22,7 +21,6 @@ LIC_FILES_CHKSUM = "\
 	file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1 \
 	file://reftable/LICENSE;md5=1a6424cafc4c9c88c689848e165af33b \
 	file://sha1dc/LICENSE.txt;md5=9bbe4c990a9e98ea4b98ef5d3bcb8a7a \
-	file://compat/nedmalloc/License.txt;md5=e4224ccaecb14d942c71d31bef20d78c \
 	file://compat/inet_ntop.c;md5=76593c6f74e8ced5b24520175688d59b;endline=16 \
 	file://compat/obstack.h;md5=08ad25fee5428cd879ceef451ce3a22e;endline=18 \
 	file://compat/poll/poll.h;md5=9fc00170a53b8e3e52157c91ac688dd1;endline=19 \
@@ -48,7 +46,7 @@ EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig "
 # Needs brokensep as this doesn't use automake
 inherit autotools-brokensep perlnative bash-completion manpages
 
-EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+EXTRA_OEMAKE = "NO_RUST=1 NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
 EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'"
 EXTRA_OEMAKE += "COMPUTE_HEADER_DEPENDENCIES=no"
 EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
@@ -170,7 +168,7 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb"
+SRC_URI[tarball.sha256sum] = "0842dc384a23ac33ba3e570c4f3a8ded85963ee4713b1cd21153c3db41813d1e"
 
 CVE_STATUS[CVE-2024-32002] = "fixed-version: fixed since v2.46.0"
 CVE_STATUS[CVE-2024-50349] = "fixed-version: fixed since v2.49.0"
-- 
2.47.3

[PATCH 12/45] glib-2.0: upgrade 2.88.1 -> 2.88.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Do-not-write-bindir-into-pkg-config-files.patch      | 2 +-
 .../glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 2 +-
 .../0001-Install-gio-querymodules-as-libexec_PROGRAM.patch    | 2 +-
 ...Remove-the-warning-about-deprecated-paths-in-schemas.patch | 2 +-
 ...gio-tests-resources.c-comment-out-a-build-host-only-.patch | 2 +-
 .../files/0001-meson-Run-atomics-test-on-clang-as-well.patch  | 4 ++--
 ...meson.build-do-not-enable-pidfd-features-on-native-g.patch | 4 ++--
 .../0010-Do-not-hardcode-python-path-into-various-tools.patch | 2 +-
 meta/recipes-core/glib-2.0/files/relocate-modules.patch       | 2 +-
 meta/recipes-core/glib-2.0/files/skip-timeout.patch           | 2 +-
 ...{glib-2.0-initial_2.88.1.bb => glib-2.0-initial_2.88.2.bb} | 0
 .../glib-2.0/{glib-2.0_2.88.1.bb => glib-2.0_2.88.2.bb}       | 0
 meta/recipes-core/glib-2.0/glib.inc                           | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0-initial_2.88.1.bb => glib-2.0-initial_2.88.2.bb} (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.88.1.bb => glib-2.0_2.88.2.bb} (100%)

diff --git a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
index b6ad6035c5..11e9508840 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 89c0644254023cfd5a22685fbbb50ebd8c6224df Mon Sep 17 00:00:00 2001
+From 83282a978c5107c682ab4c75ac7407961bb17788 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 15 Feb 2019 11:17:27 +0100
 Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files
diff --git a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
index c698376d3f..40398f25f7 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -1,4 +1,4 @@
-From 727d5239c378c820f874b50d539f87b54a3757a9 Mon Sep 17 00:00:00 2001
+From d02e061f830b7051878e8a467f393e85110e4e1a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 15 Mar 2014 22:42:29 -0700
 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
diff --git a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 6211c31c8f..bf669bd4b7 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
-From af1354b16aeffbfefc7e8d32160c97105a93a84f Mon Sep 17 00:00:00 2001
+From 72a58d19ae7f80985d9c91751fd6c359464ce292 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Tue, 22 Mar 2016 15:14:58 +0200
 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
diff --git a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 594c444797..eef7c9db86 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -1,4 +1,4 @@
-From 6237ed5e1677c3b0ea50c92dc36e864ca860e1bd Mon Sep 17 00:00:00 2001
+From c1eaa4dd2e2c09e9930949d4a9ee08e3e21b1a88 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 12 Jun 2015 17:08:46 +0300
 Subject: [PATCH] Remove the warning about deprecated paths in schemas
diff --git a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
index 243961ab8e..14c8c701ba 100644
--- a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
@@ -1,4 +1,4 @@
-From 521b129c7c6329a01a5f56b4604ea1b7499b03ad Mon Sep 17 00:00:00 2001
+From d9c75aef8b68887ef4f1dd9bb73542cc0ff02b20 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 8 Jan 2020 18:22:46 +0100
 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
index fda448e3cc..1fe00df8fc 100644
--- a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
@@ -1,4 +1,4 @@
-From 69e80e3b936e57eaecda231b12b554c075218deb Mon Sep 17 00:00:00 2001
+From f72296cbd6f04f4f74b49b961f3cb405efa112f0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 12 Oct 2019 17:46:26 -0700
 Subject: [PATCH] meson: Run atomics test on clang as well
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index bb68398..3e9e03a 100644
+index 25802aa..c53d216 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -2100,7 +2100,7 @@ atomicdefine = '''
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
index 711572b139..fa46bee904 100644
--- a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
@@ -1,4 +1,4 @@
-From e79e19bc1e6a7e8fb8596c4a9d60e21032350784 Mon Sep 17 00:00:00 2001
+From 03614474ac998422d0348c16c588a9ad50c97398 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sat, 16 Sep 2023 22:28:27 +0200
 Subject: [PATCH] meson.build: do not enable pidfd features on native glib
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 3e9e03a..f1957f0 100644
+index c53d216..330ccf3 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1098,7 +1098,8 @@ if cc.links('''#include <sys/syscall.h>
diff --git a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
index 0f98133802..7a2c168756 100644
--- a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
+++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -1,4 +1,4 @@
-From 6d92086a791c2320b46817640ceba901361f34fe Mon Sep 17 00:00:00 2001
+From f37cec951e3c564d96afcfee1279f4a9fafcc822 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 3 Oct 2017 10:45:55 +0300
 Subject: [PATCH] Do not hardcode python path into various tools
diff --git a/meta/recipes-core/glib-2.0/files/relocate-modules.patch b/meta/recipes-core/glib-2.0/files/relocate-modules.patch
index 7f326d8588..421dcb8f9a 100644
--- a/meta/recipes-core/glib-2.0/files/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/files/relocate-modules.patch
@@ -1,4 +1,4 @@
-From 20721d24485a51206189b3128835c3c3098601b3 Mon Sep 17 00:00:00 2001
+From d99e85f606530950514446a3113fe39c8c67934c Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
diff --git a/meta/recipes-core/glib-2.0/files/skip-timeout.patch b/meta/recipes-core/glib-2.0/files/skip-timeout.patch
index 43506d69f5..25f5324784 100644
--- a/meta/recipes-core/glib-2.0/files/skip-timeout.patch
+++ b/meta/recipes-core/glib-2.0/files/skip-timeout.patch
@@ -1,4 +1,4 @@
-From d548554b8793d82b93c7c7b2198e368b57916958 Mon Sep 17 00:00:00 2001
+From e19423cec5b32bfa5ff1bcd567e51fa55713f94e Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Thu, 28 Mar 2024 16:27:09 +0000
 Subject: [PATCH] Skip /timeout/rounding test
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.1.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.2.bb
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0-initial_2.88.2.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.88.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.88.2.bb
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.88.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.88.2.bb
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 8d23092187..92b919e00b 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -238,7 +238,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \
                                 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
                               "
 
-SRC_URI[archive.sha256sum] = "51ab804c56f6eab3e5045c774d1290ac5e4c923d4f9a3d8e33123bee45c1840e"
+SRC_URI[archive.sha256sum] = "cf3f215a640c8a4257f14317586b8f1fdd25a10a93cb4bdda147c0f9ad88e74f"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.
-- 
2.47.3

[PATCH 13/45] gnu-config: upgrade to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 65a32effd7..5d82be87da 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRCREV = "a2287c3041a3f2a204eb942e09c015eab00dc7dd"
-PV = "20250709+git"
+SRCREV = "428664896cf9e92d264976a960c76660938dffce"
+PV = "20260629+git"
 
 SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \
            file://gnu-configize.in"
-- 
2.47.3

[PATCH 14/45] gn: upgrade to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Build only gn, as otherwise ninja will attempt to run the integration
tests (which are cross-compiled). Only gn executable is installed,
so this doesn't reduce the output in ${D}.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/gn/gn_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gn/gn_git.bb b/meta/recipes-devtools/gn/gn_git.bb
index c5ba7761b4..64217adbcb 100644
--- a/meta/recipes-devtools/gn/gn_git.bb
+++ b/meta/recipes-devtools/gn/gn_git.bb
@@ -8,7 +8,7 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main \
 "
-SRCREV = "bac66cfc3254aabcd8640c8ebbeb6d62a198d454"
+SRCREV = "1d86777e7f2562a86ecea77d1809ac4f82bb5bfe"
 PV = "0+git"
 
 BB_GIT_SHALLOW = ""
@@ -39,7 +39,7 @@ do_configure() {
 do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
 
 do_compile() {
-    ninja -C ${B} --verbose
+    ninja -C ${B} --verbose gn
 }
 
 do_install() {
-- 
2.47.3

[PATCH 15/45] gtk-doc: upgrade 1.35.1 -> 1.36.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Convert to meson, remove autotools-specific tweaks and patches:
- conditionaltests.patch adds an option already available in meson
- 0001-Do-not-error-out-if-xsltproc-is-not-found.patch
(see below).

Add a patch and a meson option to avoid unneeded check for runtime python
module dependencies.

Move dependencies needed to run gtk-doc to gtk-doc bbclass
(so they aren't built and pulled in until actually needed).

This allows dropping the 'working-scripts' logic in the recipe,
except for xsltproc-native whose location is used during gtk-doc build.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes-recipe/gtk-doc.bbclass           |  2 +-
 ...t-error-out-if-xsltproc-is-not-found.patch | 28 ----------
 ...code-paths-to-perl-python-in-scripts.patch |  2 +-
 ...an-option-to-not-check-for-runtime-d.patch | 56 +++++++++++++++++++
 .../gtk-doc/files/conditionaltests.patch      | 42 --------------
 .../gtk-doc/files/no-clobber.patch            |  2 +-
 .../gtk-doc/files/pkg-config-native.patch     |  2 +-
 .../{gtk-doc_1.35.1.bb => gtk-doc_1.36.1.bb}  | 33 +++--------
 8 files changed, 68 insertions(+), 99 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
 create mode 100644 meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch
 delete mode 100644 meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.35.1.bb => gtk-doc_1.36.1.bb} (51%)

diff --git a/meta/classes-recipe/gtk-doc.bbclass b/meta/classes-recipe/gtk-doc.bbclass
index 33f6617e1b..5f4745e433 100644
--- a/meta/classes-recipe/gtk-doc.bbclass
+++ b/meta/classes-recipe/gtk-doc.bbclass
@@ -36,7 +36,7 @@ DEPENDS:append = " gtk-doc-native"
 export STAGING_DIR_HOST
 
 inherit pkgconfig qemu
-DEPENDS:append = "${@' qemu-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
+DEPENDS:append = "${@' qemu-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native python3-pygments-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
 inherit_defer ${@bb.utils.contains('GTKDOC_ENABLED', 'True', 'python3native', '', d)}
 
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
deleted file mode 100644
index 575ca5d32f..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5d64ab3a7c18904231d611b1262d1289b7282930 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 7 Sep 2016 14:52:04 +0300
-Subject: [PATCH] Do not error out if xsltproc is not found.
-
-This allows us to drop the hard xsltproc dependency, if we're not
-going to actually run the gtkdoc scripts (when api documentation is
-disabled).
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f238de9..909771d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@ dnl Check for xsltproc
- dnl
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- if test -z "$XSLTPROC"; then
--	AC_MSG_ERROR([xsltproc not found])
-+	AC_MSG_WARN([xsltproc not found])
- fi
- 
- dnl
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
index 600ea40f3d..c9d78145ff 100644
--- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
+++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
@@ -1,4 +1,4 @@
-From 98fc3c6e6ac36a2351ee7ff260bf74a7866c8483 Mon Sep 17 00:00:00 2001
+From 00a3a827aca9e053cb0d69bea50a61fece341f0f Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 31 Aug 2016 16:44:46 +0300
 Subject: [PATCH] Do not hardocode paths to perl/python in scripts.
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch b/meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch
new file mode 100644
index 0000000000..88ec64cdb3
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch
@@ -0,0 +1,56 @@
+From ffa3ed38663cc806f914691c63ca7d8fab959eef Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Sun, 21 Jun 2026 11:11:04 +0200
+Subject: [PATCH] meson.build: add an option to not check for runtime
+ dependencies at build time
+
+pygments and parametrized are run-time dependencies, and should
+not be enforced at build time as they are never actually used then.
+
+This is especially useful in cross-compilation, as the modules
+are checked in the python installation on the build host, and that
+has no relevance to the target environment that the build outputs
+will be executed in.
+
+https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/105
+Upstream-Status: Backport [link above]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ meson.build       | 9 ++++++---
+ meson_options.txt | 6 ++++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 30f1520..e087cff 100644
+--- a/meson.build
++++ b/meson.build
+@@ -8,9 +8,12 @@ fs = import('fs')
+ gnome = import('gnome')
+ python = import('python')
+ 
+-required_python_modules = ['pygments']
+-if get_option('tests')
+-  required_python_modules += ['parameterized']
++required_python_modules = []
++if get_option('check_runtime_deps')
++  required_python_modules = ['pygments']
++  if get_option('tests')
++    required_python_modules += ['parameterized']
++  endif
+ endif
+ 
+ python3 = python.find_installation('python3', modules: required_python_modules)
+diff --git a/meson_options.txt b/meson_options.txt
+index d44dbb4..84463b2 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -21,3 +21,9 @@ option(
+   type: 'boolean', value: true,
+   description: 'Build the test suite (requires glib and the parameterized python module)'
+ )
++
++option(
++  'check_runtime_deps',
++  type: 'boolean', value: true,
++  description: 'Check for runtime dependencies during build configuration'
++)
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
deleted file mode 100644
index 81017f61ce..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e4d003318a87ff895b1fcdad1ba4ca3f4f730cf9 Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Tue, 27 Jun 2017 21:00:58 +0100
-Subject: [PATCH] gtk-doc: Handle floating gtk-doc dependency
-
-Allow the tests to be explicitly disabled to avoid floating dependnecy
-issues. This is not really an issue with RSS but is on previous releases.
-
-RP 2017/6/27
-Upstream-Status: Pending
----
- configure.ac | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 909771d..9db9fbc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then
- 	fi
- fi
- 
-+AC_ARG_ENABLE([tests],
-+	AS_HELP_STRING([--enable-tests],
-+	[enable tests (default=yes)]),,
-+	[enable_tests="yes"])
-+
- dnl if glib is available we can enable the tests
- PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
- 	[	glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`"
-@@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
- 		build_tests="no"
- 	]
- )
-+if test "x$enable_tests" != "xyes"; then
-+	gtk_doc_use_libtool="no"
-+	build_tests="no"
-+fi
-+
- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes )
- dnl this enables the rule in test/Makefile.am
- AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)
diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
index a75c2bceb7..a9c7154fc4 100644
--- a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
+++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
@@ -1,4 +1,4 @@
-From bcf24419dc1965086793b4ff66a2f9b06574f974 Mon Sep 17 00:00:00 2001
+From 01a52d8cf076e2692d947c8ed2681cb794eaa3c0 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Wed, 21 Mar 2018 14:47:29 +0000
 Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install
diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
index b1c6c25dc4..de16ea0cc6 100644
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -1,4 +1,4 @@
-From 24ddd2afb4fcdb8b7c88af5caec0c18ec9e7ff4e Mon Sep 17 00:00:00 2001
+From 0800f184cffc837276ea65b86e4efc7942eb1d7e Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Mon, 5 Sep 2016 22:25:44 +0100
 Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.35.1.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.36.1.bb
similarity index 51%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.35.1.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.36.1.bb
index c9ab7ff1e9..dcdeebe258 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.35.1.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.36.1.bb
@@ -5,55 +5,38 @@ HOMEPAGE = "https://www.gtk.org/docs/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase
 
-# Configure the scripts correctly (and build their dependencies) only if they are actually
-# going to be used; otheriwse we need only the m4/makefile includes from the gtk-doc tarball.
-PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", "working-scripts", "", d)}"
+DEPENDS += "libxslt-native"
 
-# This will cause target gtk-doc to hardcode paths of native dependencies
-# into its scripts. This means that target gtk-doc package is broken;
-# hopefully no one minds because its scripts are not used for anything during build
-# and shouldn't be used on targets.
-PACKAGECONFIG[working-scripts] = ",,libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets python3-pygments"
-PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
+PACKAGECONFIG ??= ""
 
-CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc"
+PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,glib-2.0"
 
-SRC_URI[archive.sha256sum] = "611c9f24edd6d88a8ae9a79d73ab0dc63c89b81e90ecc31d6b9005c5f05b25e2"
+EXTRA_OEMESON = "-Dyelp_manual=false -Dcheck_runtime_deps=false"
+
+SRC_URI[archive.sha256sum] = "0e517a5f97069831181be177516bde8aa8b3922398f2bdb09e265d22aecadbc5"
 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
-           file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
-           file://conditionaltests.patch \
            file://no-clobber.patch \
+           file://0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch \
            "
 SRC_URI:append:class-native = " file://pkg-config-native.patch"
 
 BBCLASSEXTEND = "native nativesdk"
 
-# Do not check for XML catalogs when building because that
-# information is not used for anything during build. Recipe
-# dependencies make sure we have all the right bits.
-do_configure:prepend() {
-        sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac
-}
-
 do_install:append () {
     # configure values for python3 and pkg-config encoded in scripts
     for fn in ${bindir}/gtkdoc-depscan \
         ${bindir}/gtkdoc-mkhtml2 \
         ${datadir}/gtk-doc/python/gtkdoc/config_data.py \
         ${datadir}/gtk-doc/python/gtkdoc/config.py; do
-        sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \
+        sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/,,' \
             -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
             -e '1s|^#!.*|#!/usr/bin/env python3|' \
             -i ${D}$fn
     done
 }
 
-FILES:${PN} += "${datadir}/sgml"
-FILES:${PN}-doc = ""
-
 SYSROOT_PREPROCESS_FUNCS:append:class-native = " gtkdoc_makefiles_sysroot_preprocess"
 gtkdoc_makefiles_sysroot_preprocess() {
         # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
-- 
2.47.3

[PATCH 16/45] iproute2: upgrade 7.0.0 -> 7.1.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-include-libnetlink.h-add-missing-include-for-htobe64.patch | 2 +-
 .../0002-include-color.h-add-missing-include-for-types.patch    | 2 +-
 .../iproute2/{iproute2_7.0.0.bb => iproute2_7.1.0.bb}           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-connectivity/iproute2/{iproute2_7.0.0.bb => iproute2_7.1.0.bb} (97%)

diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
index efca33b6cf..1d3fc5bb40 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
@@ -1,4 +1,4 @@
-From c32fe3424c067baebbf6c263886e04bb99a5af77 Mon Sep 17 00:00:00 2001
+From dc1db1129a98530fb44b3d1a448e991adaf5b066 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sat, 24 Aug 2024 15:32:25 +0200
 Subject: [PATCH] include/libnetlink.h: add missing include for htobe64
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch b/meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch
index c5c7254c61..2078e48d8a 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0002-include-color.h-add-missing-include-for-types.patch
@@ -1,4 +1,4 @@
-From 2289366b53c5bdc117907e88578d24d2007fd035 Mon Sep 17 00:00:00 2001
+From 5c7bd395e9364a1c7c9370680ff265e50cf2b2b9 Mon Sep 17 00:00:00 2001
 From: Andrej Kozemcak <andrej.kozemcak@siemens.com>
 Date: Thu, 5 Mar 2026 08:06:54 +0100
 Subject: [PATCH] include/color.h: add missing include for types
diff --git a/meta/recipes-connectivity/iproute2/iproute2_7.0.0.bb b/meta/recipes-connectivity/iproute2/iproute2_7.1.0.bb
similarity index 97%
rename from meta/recipes-connectivity/iproute2/iproute2_7.0.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_7.1.0.bb
index 15f626de3e..c5944f2e54 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_7.0.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_7.1.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
            file://0002-include-color.h-add-missing-include-for-types.patch \
            "
 
-SRC_URI[sha256sum] = "e62890f7b5de63c05a3bf331dc8deb4c015c336013f341a4edf46969797f2f4e"
+SRC_URI[sha256sum] = "fd9fa1b95809417157ca83dd72957e3261bdbce896353cb936f80af0b33a4b5c"
 
 inherit update-alternatives bash-completion pkgconfig
 
-- 
2.47.3

[PATCH 17/45] json-c: upgrade 0.18 -> 0.19

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Tweak ptests installation.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../json-c/{json-c_0.18.bb => json-c_0.19.bb}             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/json-c/{json-c_0.18.bb => json-c_0.19.bb} (84%)

diff --git a/meta/recipes-devtools/json-c/json-c_0.18.bb b/meta/recipes-devtools/json-c/json-c_0.19.bb
similarity index 84%
rename from meta/recipes-devtools/json-c/json-c_0.18.bb
rename to meta/recipes-devtools/json-c/json-c_0.19.bb
index c112aacf4b..738566d303 100644
--- a/meta/recipes-devtools/json-c/json-c_0.18.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.19.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
 SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
            file://run-ptest \
            "
-SRC_URI[sha256sum] = "876ab046479166b869afc6896d288183bbc0e5843f141200c677b3e8dfb11724"
+SRC_URI[sha256sum] = "37ad0249902e301bd9052bf712e511fcc6acff4ecaad4b5900aad9ce564e26de"
 
 # NVD uses full tag name including date
 CVE_VERSION = "0.18-20240915"
@@ -19,20 +19,22 @@ UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+"
 
 RPROVIDES:${PN} = "libjson"
 
-# Apps aren't needed/packaged and their CMakeLists.txt is incompatible with CMake 4+.
 EXTRA_OECMAKE = "-DDISABLE_WERROR=ON \
-                 -DBUILD_APPS=OFF \
 "
 
 inherit cmake ptest
 
 do_install_ptest() {
     install -d ${D}/${PTEST_PATH}/tests
+    install -d ${D}/${PTEST_PATH}/apps
     install ${B}/tests/test* ${D}/${PTEST_PATH}/tests
     install ${S}/tests/*.test ${D}/${PTEST_PATH}/tests
     install ${S}/tests/*.expected ${D}/${PTEST_PATH}/tests
     install ${S}/tests/test-defs.sh ${D}/${PTEST_PATH}/tests
     install ${S}/tests/*json ${D}/${PTEST_PATH}/tests
+    install ${B}/apps/json_parse ${D}/${PTEST_PATH}/apps
 }
 
+RDEPENDS:${PN}-ptest += "xxd"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
2.47.3

[PATCH 18/45] libarchive: upgrade 3.8.7 -> 3.8.8

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libarchive/{libarchive_3.8.7.bb => libarchive_3.8.8.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/libarchive/{libarchive_3.8.7.bb => libarchive_3.8.8.bb} (97%)

diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.7.bb b/meta/recipes-extended/libarchive/libarchive_3.8.8.bb
similarity index 97%
rename from meta/recipes-extended/libarchive/libarchive_3.8.7.bb
rename to meta/recipes-extended/libarchive/libarchive_3.8.8.bb
index e8c3a3bfe3..2c8bf922a6 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.8.7.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.8.8.bb
@@ -34,7 +34,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \
           "
 UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
 
-SRC_URI[sha256sum] = "4b787cca6697a95c7725e45293c973c208cbdc71ae2279f30ef09f52472b9166"
+SRC_URI[sha256sum] = "038918ea315cdd446cc63acfe880d6011832bbe1711c887de5de5441b306c190"
 
 inherit autotools update-alternatives pkgconfig ptest
 
-- 
2.47.3

[PATCH 19/45] libffi: upgrade 3.5.2 -> 3.6.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/libffi/libffi/not-win32.patch          | 6 +++---
 .../libffi/{libffi_3.5.2.bb => libffi_3.6.0.bb}             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-support/libffi/{libffi_3.5.2.bb => libffi_3.6.0.bb} (94%)

diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch
index ca76fde855..17f45456ad 100644
--- a/meta/recipes-support/libffi/libffi/not-win32.patch
+++ b/meta/recipes-support/libffi/libffi/not-win32.patch
@@ -1,4 +1,4 @@
-From 28d0fd6b73163fc2dbc10c7dc838a8222671f88c Mon Sep 17 00:00:00 2001
+From b89a6b1ebfde657a8ff3c325297caf2bfbd1f7f4 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Thu, 4 Feb 2016 16:22:50 +0000
 Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc
@@ -20,10 +20,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 258107d..ef1a285 100644
+index 2c8ba77..4e92515 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -411,7 +411,7 @@ AC_ARG_ENABLE(multi-os-directory,
+@@ -423,7 +423,7 @@ AC_ARG_ENABLE(multi-os-directory,
  
  # These variables are only ever used when we cross-build to X86_WIN32.
  # And we only support this with GCC, so...
diff --git a/meta/recipes-support/libffi/libffi_3.5.2.bb b/meta/recipes-support/libffi/libffi_3.6.0.bb
similarity index 94%
rename from meta/recipes-support/libffi/libffi_3.5.2.bb
rename to meta/recipes-support/libffi/libffi_3.6.0.bb
index d3aa90d429..8868279d6a 100644
--- a/meta/recipes-support/libffi/libffi_3.5.2.bb
+++ b/meta/recipes-support/libffi/libffi_3.6.0.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ce4763670c5b7756000561f9af1ab178"
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BPN}-${PV}.tar.gz \
            file://not-win32.patch \
            "
-SRC_URI[sha256sum] = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc"
+SRC_URI[sha256sum] = "31ff1fe32deaebfbb388727f32677bb254bf2a41382c51464c0b1837c9ee9828"
 
 EXTRA_OECONF = "--disable-builddir"
 EXTRA_OECONF:class-native += "--with-gcc-arch=generic"
-- 
2.47.3

[PATCH 20/45] libical: upgrade 3.0.20 -> 4.0.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop -DSHARED_ONLY=True (replaced upstream with LIBICAL_STATIC, false by default).

Backport a bluez5 patch to support the new version.

Drop 0001-cmake-Do-not-export-CC-into-gir-compiler.patch (merged upstream).

Rebase flags.patch (couldn't find evidence of ical-glib-static and so
that chunk was dropped).

Rework various upstream cmake options.

License-Update: file renamed, additional information added at the bottom:
https://github.com/libical/libical/blob/v4.0.3/LICENSE.txt
LGPL/MPL texts aren't necessary to track, as LICENSE.txt specifies
what the actual terms are.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/conf/distro/include/no-static-libs.inc   |  1 -
 meta/recipes-connectivity/bluez5/bluez5.inc   |  1 +
 .../0001-build-Support-libical-4.0.patch      | 34 +++++++++++++++
 ...e-Do-not-export-CC-into-gir-compiler.patch | 30 -------------
 .../libical/libical/flags.patch               | 42 +++++++++----------
 .../{libical_3.0.20.bb => libical_4.0.3.bb}   | 19 ++++-----
 6 files changed, 64 insertions(+), 63 deletions(-)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch
 delete mode 100644 meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
 rename meta/recipes-support/libical/{libical_3.0.20.bb => libical_4.0.3.bb} (74%)

diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc
index 75359928a1..cf26873992 100644
--- a/meta/conf/distro/include/no-static-libs.inc
+++ b/meta/conf/distro/include/no-static-libs.inc
@@ -23,7 +23,6 @@ DISABLE_STATIC:pn-musl = ""
 
 EXTRA_OECONF:append = "${DISABLE_STATIC}"
 
-EXTRA_OECMAKE:append:pn-libical = " -DSHARED_ONLY=True"
 EXTRA_OECMAKE:append:pn-libjpeg-turbo = " -DENABLE_STATIC=False"
 EXTRA_OECMAKE:append:pn-libjpeg-turbo-native = " -DENABLE_STATIC=False"
 
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 8d2e1e8f42..a7eefa310b 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -68,6 +68,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            file://init \
            file://run-ptest \
            file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
+           file://0001-build-Support-libical-4.0.patch \
            "
 S = "${UNPACKDIR}/bluez-${PV}"
 
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch
new file mode 100644
index 0000000000..d4326e0640
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch
@@ -0,0 +1,34 @@
+From fe0d11b97634c546166e895bafbede2d4df6769f Mon Sep 17 00:00:00 2001
+From: Funda Wang <fundawang@yeah.net>
+Date: Thu, 4 Jun 2026 10:01:35 +0200
+Subject: [PATCH] build: Support libical 4.0
+
+libical 4.0 split off some vcal related functions to a separate shared
+library, libicalvcal. As libicalvcal depends on libical itself, first
+check for libicalvcal being available, and if it fails, check for
+just libical.
+
+Closes: https://github.com/bluez/bluez/issues/2090
+
+Tested-by: Bastien Nocera <hadess@hadess.net>
+Upstream-Status: Backport [https://github.com/bluez/bluez/commit/e60d07255327db3fc4e3a28d7fcc792cd42c34d0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 52de7d6..1cdd551 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -306,7 +306,9 @@ fi
+ AC_ARG_ENABLE(obex, AS_HELP_STRING([--disable-obex],
+ 		[disable OBEX profile support]), [enable_obex=${enableval}])
+ if (test "${enable_obex}" != "no"); then
+-	PKG_CHECK_MODULES(ICAL, libical)
++	PKG_CHECK_MODULES(ICAL, [libicalvcal >= 4.0.0], [],
++                [PKG_CHECK_MODULES(ICAL, [libical])]
++        )
+ fi
+ AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no")
+ 
diff --git a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
deleted file mode 100644
index 4027c218c5..0000000000
--- a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7b20ca7f24a4cac25998bfcc70eed75bf796816b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 3 Mar 2022 20:10:04 -0800
-Subject: [PATCH] cmake: Do not export CC into gir compiler
-
-this helps cross compilers where full compiler commandline defines the
-compiler rather than just CC variable, therefore let it use the default
-values from environment and not synthesize it from CMAKE_C_COMPILER just
-for this case.
-
-Upstream-Status: Backport [https://github.com/libical/libical/pull/552]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- cmake/modules/GObjectIntrospectionMacros.cmake | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake
-index 83aff93..d7d3f89 100644
---- a/cmake/modules/GObjectIntrospectionMacros.cmake
-+++ b/cmake/modules/GObjectIntrospectionMacros.cmake
-@@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs)
-     set(_gir_libtool "--no-libtool")
- 
-     add_custom_command(
--      COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'"
--              ${GObjectIntrospection_SCANNER}
-+      COMMAND ${GObjectIntrospection_SCANNER}
-               ${GObjectIntrospection_SCANNER_ARGS}
-               --namespace=${_gir_namespace}
-               --nsversion=${_gir_version}
diff --git a/meta/recipes-support/libical/libical/flags.patch b/meta/recipes-support/libical/libical/flags.patch
index 5fa4b479ee..868314591c 100644
--- a/meta/recipes-support/libical/libical/flags.patch
+++ b/meta/recipes-support/libical/libical/flags.patch
@@ -1,7 +1,8 @@
-From a5642fa1cd8c835209b39ec99e534d341779c985 Mon Sep 17 00:00:00 2001
+From cba8f762f6a3270530550915d957c01f3da9a601 Mon Sep 17 00:00:00 2001
 From: Milan Crha <mcrha@redhat.com>
 Date: Wed, 10 Sep 2025 09:52:37 +0200
 Subject: [PATCH] libical-glib: Hide some target options in the installed CMake
+
  files
 
 The build paths could be shown in the installed .cmake files, thus
@@ -12,29 +13,26 @@ Closes https://github.com/libical/libical/issues/532
 Upstream-Status: Submitted [https://github.com/libical/libical/pull/1010]
 Signed-off-by: Ross Burton <ross.burton@arm.com>
 ---
- src/libical-glib/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ src/libical-glib/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index 9f69e9c5..aa55e013 100644
+index d63bbf3..d820160 100644
 --- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -8,8 +8,8 @@ add_executable(ical-glib-src-generator
-   tools/xml-parser.h
- )
-
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
-+target_compile_options(ical-glib-src-generator PRIVATE ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
-+target_link_libraries(ical-glib-src-generator PRIVATE ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
-
- install(
-   TARGETS ical-glib-src-generator
-@@ -130,7 +130,7 @@ target_link_libraries(ical-glib PRIVATE ical ${GLIB_LIBRARIES})
- if(NOT SHARED_ONLY AND NOT STATIC_ONLY)
-   add_library(ical-glib-static STATIC ${LIBICAL_GLIB_SOURCES})
-   add_dependencies(ical-glib-static ical-header)
--  target_compile_options(ical-glib-static PUBLIC ${GLIB_CFLAGS} -DG_LOG_DOMAIN="libical-glib" -DLIBICAL_GLIB_COMPILATION)
-+  target_compile_options(ical-glib-static PRIVATE ${GLIB_CFLAGS} -DG_LOG_DOMAIN="libical-glib" -DLIBICAL_GLIB_COMPILATION)
-   target_link_libraries(ical-glib-static ${GLIB_LIBRARIES})
+@@ -24,13 +24,14 @@ if(NOT DEFINED LIBXML2_DEFINITIONS)
  endif()
+ target_compile_options(
+   ical-glib-src-generator
+-  PUBLIC
++  PRIVATE
+     ${GLIB_CFLAGS}
+     ${LIBXML2_DEFINITIONS}
+     -DG_LOG_DOMAIN=\"src-generator\"
+ )
+ target_link_libraries(
+   ical-glib-src-generator
++  PRIVATE
+   ${GLIB_LDFLAGS}
+   ${GOBJECT_LDFLAGS}
+   ${LIBXML2_LIBRARIES}
diff --git a/meta/recipes-support/libical/libical_3.0.20.bb b/meta/recipes-support/libical/libical_4.0.3.bb
similarity index 74%
rename from meta/recipes-support/libical/libical_3.0.20.bb
rename to meta/recipes-support/libical/libical_4.0.3.bb
index 7f85522e91..d7001d4a8c 100644
--- a/meta/recipes-support/libical/libical_3.0.20.bb
+++ b/meta/recipes-support/libical/libical_4.0.3.bb
@@ -6,17 +6,14 @@ their calendar data and arrange meetings with other users. "
 HOMEPAGE = "https://github.com/libical/libical"
 BUGTRACKER = "https://github.com/libical/libical/issues"
 LICENSE = "LGPL-2.1-only | MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
-                    file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \
-                    file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6d9294493d031c817783b0400a126c89 \
                     "
 SECTION = "libs"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
-           file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \
            file://flags.patch \
-          "
-SRC_URI[sha256sum] = "e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2"
+           "
+SRC_URI[sha256sum] = "86f29029d0ec9fa30c9001de16c0859a3816ae154ff5b097392b014e21a3d254"
 
 inherit cmake pkgconfig gobject-introspection vala github-releases
 
@@ -24,7 +21,7 @@ DEPENDS += "libical-native"
 
 PACKAGECONFIG ??= "icu glib"
 PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db"
-PACKAGECONFIG[glib] = "-DICAL_GLIB=True,-DICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2"
+PACKAGECONFIG[glib] = "-DLIBICAL_GLIB=True,-DLIBICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2"
 # ICU is used for RSCALE (RFC7529) support
 PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu"
 
@@ -33,13 +30,15 @@ EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl"
 # Disable the test suite as we can't install it
 EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false"
 # doc build fails with linker error (??) for libical-glib so disable it
-EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false"
+EXTRA_OECMAKE += "-DLIBICAL_GLIB_BUILD_DOCS=false"
 # gobject-introspection
 EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper"
 EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper"
 EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen"
-EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}"
-EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF"
+EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DLIBICAL_GOBJECT_INTROSPECTION=ON -DLIBICAL_GLIB_VAPI=ON', '-DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF', d)}"
+EXTRA_OECMAKE:append:class-native = " -DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF"
+# no java
+EXTRA_OECMAKE += "-DLIBICAL_JAVA_BINDINGS=False"
 
 # Tell the cross-libical where the tool it needs to build is
 EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
-- 
2.47.3

Re: [OE-core] [PATCH 20/45] libical: upgrade 3.0.20 -> 4.0.3

[Mathieu Dubois-Briand]

On Mon Jul 6, 2026 at 7:16 PM CEST, Alexander Kanavin via lists.openembedded.org wrote:
> From: Alexander Kanavin <alex@linutronix.de>

Hi Alex,

>
> Drop -DSHARED_ONLY=True (replaced upstream with LIBICAL_STATIC, false by default).
>
> Backport a bluez5 patch to support the new version.
>

I believe the said patch is part of bluez 5.87, and Richard upgraded the
bluez recipe a few days ago. So now applying this patch is failing:

ERROR: bluez5-5.87-r0 do_patch: Applying patch '/srv/pokybuild/yocto-worker/beaglebone/build/layers/openembedded-core/meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch' on target directory '/srv/pokybuild/yocto-worker/beaglebone/build/build/tmp/work/cortexa8t2hf-neon-poky-linux-gnueabi/bluez5/5.87/sources/bluez-5.87'
CmdError('quilt --quiltrc /srv/pokybuild/yocto-worker/beaglebone/build/build/tmp/work/cortexa8t2hf-neon-poky-linux-gnueabi/bluez5/5.87/recipe-sysroot-native/etc/quiltrc push', 1, 'stdout: Applying patch 0001-build-Support-libical-4.0.patch
patching file configure.ac
Hunk #1 FAILED at 306.
1 out of 1 hunk FAILED -- rejects in file configure.ac
Patch 0001-build-Support-libical-4.0.patch can be reverse-applied

https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/4102

I believe re-sending the libical upgrade without the bluez patch should
be enough.

Thanks,
Mathieu

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 20/45] libical: upgrade 3.0.20 -> 4.0.3

[Alexander Kanavin]

On Wed, 8 Jul 2026 at 07:52, Mathieu Dubois-Briand
<mathieu.dubois-briand@bootlin.com> wrote:

> I believe re-sending the libical upgrade without the bluez patch should
> be enough.

Thanks, I just re-sent the tweaked patch.

Alex

[PATCH 21/45] libpsl: upgrade 0.21.5 -> 0.22.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libpsl/{libpsl_0.21.5.bb => libpsl_0.22.0.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/libpsl/{libpsl_0.21.5.bb => libpsl_0.22.0.bb} (92%)

diff --git a/meta/recipes-support/libpsl/libpsl_0.21.5.bb b/meta/recipes-support/libpsl/libpsl_0.22.0.bb
similarity index 92%
rename from meta/recipes-support/libpsl/libpsl_0.21.5.bb
rename to meta/recipes-support/libpsl/libpsl_0.22.0.bb
index b9341a986e..741038ddc5 100644
--- a/meta/recipes-support/libpsl/libpsl_0.21.5.bb
+++ b/meta/recipes-support/libpsl/libpsl_0.22.0.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f9e317096db2a598fc44237c5b8a4f7 \
 
 SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
            "
-SRC_URI[sha256sum] = "1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208"
+SRC_URI[sha256sum] = "c45c3aa17576b99873e05a9b09a44041b065bbfa390e6d474d06fbfaeb9c7722"
 
 GITHUB_BASE_URI = "https://github.com/rockdaboot/libpsl/releases"
 
-- 
2.47.3

[PATCH 22/45] lighttpd: upgrade 1.4.83 -> 1.4.84

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../lighttpd/{lighttpd_1.4.83.bb => lighttpd_1.4.84.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.83.bb => lighttpd_1.4.84.bb} (97%)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.83.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.84.bb
similarity index 97%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.83.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.84.bb
index a1a7bee227..289ecef333 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.83.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.84.bb
@@ -16,7 +16,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
            file://lighttpd \
            "
 
-SRC_URI[sha256sum] = "b3f878156480079f8a93903bd24d456074a0fbedb9b4d99fcd65df33b1f566f0"
+SRC_URI[sha256sum] = "076dd43bec8f2ba9ce6db7e7ca7e8ad72271cd529805ead2400b56efaa026f70"
 
 DEPENDS = "virtual/crypt"
 
-- 
2.47.3

[PATCH 23/45] lttng-modules: upgrade 2.15.1 -> 2.15.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop backports.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ts-during-the-folios-writeback-v6.17.patch |   91 --
 ...trace-event-i_ino-fields-to-u64-v7.1.patch | 1421 -----------------
 ...p-unnecessary-pointer-indirection-in.patch |   72 -
 ...ce-trace-noise-in-hrtimer_start-v7.1.patch |   99 --
 ...onvert-pageout-to-take-a-folio-v5.18.patch |   51 -
 ...group-IDs-to-vmscan-tracepoints-v7.1.patch |  194 ---
 ...i_ino-from-unsigned-long-to-u64-v7.1.patch |   53 -
 ...trace-event-i_ino-fields-to-u64-v7.1.patch |  273 ----
 ...e-missing-CONFIG_TRACEPOINTS-to-warn.patch |    2 +-
 ...ules_2.15.1.bb => lttng-modules_2.15.2.bb} |   10 +-
 10 files changed, 2 insertions(+), 2264 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints-v7.1.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-treewide-change-inode-i_ino-from-unsigned-long-to-u64-v7.1.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-vfs-widen-trace-event-i_ino-fields-to-u64-v7.1.patch
 rename meta/recipes-kernel/lttng/{lttng-modules_2.15.1.bb => lttng-modules_2.15.2.bb} (63%)

diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch
deleted file mode 100644
index 90a46df3cb..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 8abda1d7c6b4a6346ef79e1b677ced4077c6b96e Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 16:22:42 -0400
-Subject: [PATCH] fix: ext4: enhance tracepoints during the folios writeback
- (v6.17)
-
-See upstream commits:
-
-  commit 6b132759b0fe78e518abafb62190c294100db6d6
-  Author: Zhang Yi <yi.zhang@huawei.com>
-  Date:   Mon Jul 7 22:08:09 2025 +0800
-
-    ext4: enhance tracepoints during the folios writeback
-
-    After mpage_map_and_submit_extent() supports restarting handle if
-    credits are insufficient during allocating blocks, it is more likely to
-    exit the current mapping iteration and continue to process the current
-    processing partially mapped folio again. The existing tracepoints are
-    not sufficient to track this situation, so enhance the tracepoints to
-    track the writeback position and the return value before and after
-    submitting the folios.
-
-  commit 1bfe6354e0975fe89c3d25e81b6546d205556a4b
-  Author: Zhang Yi <yi.zhang@huawei.com>
-  Date:   Mon Jul 7 22:08:04 2025 +0800
-
-    ext4: process folios writeback in bytes
-
-    Since ext4 supports large folios, processing writebacks in pages is no
-    longer appropriate, it can be modified to process writebacks in bytes.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17907]
-
-Change-Id: I15b849b9ebcf18b75b658b8f76cfa91e205f6cf6
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/ext4.h | 34 +++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h
-index 75f92b3..fa5de84 100644
---- a/include/instrumentation/events/ext4.h
-+++ b/include/instrumentation/events/ext4.h
-@@ -242,6 +242,39 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
- 	)
- )
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,17,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_da_write_folios_start,
-+	TP_PROTO(struct inode *inode, loff_t start_pos, loff_t next_pos,
-+		 struct writeback_control *wbc),
-+
-+	TP_ARGS(inode, start_pos, next_pos, wbc),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ino_t, ino, inode->i_ino)
-+		ctf_integer(loff_t, start_pos, start_pos)
-+		ctf_integer(loff_t, next_pos, next_pos)
-+		ctf_integer(long, nr_to_write, wbc->nr_to_write)
-+		ctf_integer(int, sync_mode, wbc->sync_mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_da_write_folios_end,
-+	TP_PROTO(struct inode *inode, loff_t start_pos, loff_t next_pos,
-+		 struct writeback_control *wbc, int ret),
-+
-+	TP_ARGS(inode, start_pos, next_pos, wbc, ret),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ino_t, ino, inode->i_ino)
-+		ctf_integer(loff_t, start_pos, start_pos)
-+		ctf_integer(loff_t, next_pos, next_pos)
-+		ctf_integer(long, nr_to_write, wbc->nr_to_write)
-+		ctf_integer(int, ret, ret)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
- 	TP_PROTO(struct inode *inode, pgoff_t first_page,
- 		 struct writeback_control *wbc),
-@@ -256,6 +289,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
- 		ctf_integer(int, sync_mode, wbc->sync_mode)
- 	)
- )
-+#endif
- 
- LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
- 	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map),
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch
deleted file mode 100644
index 4b8799bd6d..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch
+++ /dev/null
@@ -1,1421 +0,0 @@
-From 22078c50f8093b80741e080e17a3196fe074884c Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 16:01:09 -0400
-Subject: [PATCH] fix: ext4: widen trace event i_ino fields to u64 (v7.1)
-
-See upstream commit:
-
-  commit d352871478616ac63d0edf90e78194ec0a19b988
-  Author: Jeff Layton <jlayton@kernel.org>
-  Date:   Wed Mar 4 10:32:39 2026 -0500
-
-    ext4: widen trace event i_ino fields to u64
-
-    In trace events, change __field(ino_t, ...) to __field(u64, ...)
-    and update TP_printk format strings to %llu/%llx to match the
-    widened field type.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17909]
-
-Change-Id: I5e266aea1a128987061a6074e2cd202b29d2e2f5
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/ext4.h | 1123 +++++++++++++++++++++++--
- 1 file changed, 1048 insertions(+), 75 deletions(-)
-
-diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h
-index fa5de84..43b93cd 100644
---- a/include/instrumentation/events/ext4.h
-+++ b/include/instrumentation/events/ext4.h
-@@ -26,6 +26,95 @@ struct ext4_extent;
- #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
- #define TP_MODE_T	__u16
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_free_inode,
-+	TP_PROTO(struct inode *inode),
-+
-+	TP_ARGS(inode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, blocks, inode->i_blocks)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(uid_t, uid, i_uid_read(inode))
-+		ctf_integer(gid_t, gid, i_gid_read(inode))
-+		ctf_integer(TP_MODE_T, mode, inode->i_mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_request_inode,
-+	TP_PROTO(struct inode *dir, int mode),
-+
-+	TP_ARGS(dir, mode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, dir, dir->i_ino)
-+		ctf_integer(dev_t, dev, dir->i_sb->s_dev)
-+		ctf_integer(TP_MODE_T, mode, mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_allocate_inode,
-+	TP_PROTO(struct inode *inode, struct inode *dir, int mode),
-+
-+	TP_ARGS(inode, dir, mode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(u64, dir, dir->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(TP_MODE_T, mode, mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_evict_inode,
-+	TP_PROTO(struct inode *inode),
-+
-+	TP_ARGS(inode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, nlink, inode->i_nlink)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_drop_inode,
-+	TP_PROTO(struct inode *inode, int drop),
-+
-+	TP_ARGS(inode, drop),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, drop, drop)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_mark_inode_dirty,
-+	TP_PROTO(struct inode *inode, unsigned long IP),
-+
-+	TP_ARGS(inode, IP),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer_hex(unsigned long, ip, IP)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate,
-+	TP_PROTO(struct inode *inode, loff_t new_size),
-+
-+	TP_ARGS(inode, new_size),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, new_size, new_size)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_free_inode,
- 	TP_PROTO(struct inode *inode),
- 
-@@ -113,8 +202,37 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate,
- 		ctf_integer(loff_t, new_size, new_size)
- 	)
- )
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin,
-+
-+	TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
-+
-+	TP_ARGS(inode, pos, len),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, pos, pos)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, len, len)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin,
-+
-+	TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
-+
-+	TP_ARGS(inode, pos, len)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin,
-+
-+	TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0))
-+	TP_ARGS(inode, pos, len)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin,
- 
- 	TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
-@@ -176,6 +294,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin,
- )
- #endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) */
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end,
-+	TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
-+			unsigned int copied),
-+
-+	TP_ARGS(inode, pos, len, copied),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, pos, pos)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, len, len)
-+		ctf_integer(unsigned int, copied, copied)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end,
- 	TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
- 			unsigned int copied),
-@@ -190,6 +324,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end,
- 		ctf_integer(unsigned int, copied, copied)
- 	)
- )
-+#endif
- 
- LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_ordered_write_end,
- 
-@@ -223,7 +358,27 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_da_write_end,
- 	TP_ARGS(inode, pos, len, copied)
- )
- 
--LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_writepages,
-+	TP_PROTO(struct inode *inode, struct writeback_control *wbc),
-+
-+	TP_ARGS(inode, wbc),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, range_start, wbc->range_start)
-+		ctf_integer(loff_t, range_end, wbc->range_end)
-+		ctf_integer(long, nr_to_write, wbc->nr_to_write)
-+		ctf_integer(long, pages_skipped, wbc->pages_skipped)
-+		ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, sync_mode, wbc->sync_mode)
-+		ctf_integer(char, for_kupdate, wbc->for_kupdate)
-+		ctf_integer(char, range_cyclic, wbc->range_cyclic)
-+	)
-+)
-+#else
-+LTTNG_TRACEPOINT_EVENT(ext4_writepages,
- 	TP_PROTO(struct inode *inode, struct writeback_control *wbc),
- 
- 	TP_ARGS(inode, wbc),
-@@ -241,8 +396,41 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
- 		ctf_integer(char, range_cyclic, wbc->range_cyclic)
- 	)
- )
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_da_write_folios_start,
-+	TP_PROTO(struct inode *inode, loff_t start_pos, loff_t next_pos,
-+		 struct writeback_control *wbc),
-+
-+	TP_ARGS(inode, start_pos, next_pos, wbc),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, start_pos, start_pos)
-+		ctf_integer(loff_t, next_pos, next_pos)
-+		ctf_integer(long, nr_to_write, wbc->nr_to_write)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, sync_mode, wbc->sync_mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_da_write_folios_end,
-+	TP_PROTO(struct inode *inode, loff_t start_pos, loff_t next_pos,
-+		 struct writeback_control *wbc, int ret),
-+
-+	TP_ARGS(inode, start_pos, next_pos, wbc, ret),
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,17,0))
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, start_pos, start_pos)
-+		ctf_integer(loff_t, next_pos, next_pos)
-+		ctf_integer(long, nr_to_write, wbc->nr_to_write)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, ret, ret)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,17,0))
- LTTNG_TRACEPOINT_EVENT(ext4_da_write_folios_start,
- 	TP_PROTO(struct inode *inode, loff_t start_pos, loff_t next_pos,
- 		 struct writeback_control *wbc),
-@@ -291,6 +479,38 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
- )
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
-+	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map),
-+
-+	TP_ARGS(inode, map),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, lblk, map->m_lblk)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(__u32, len, map->m_len)
-+		ctf_integer(__u32, flags, map->m_flags)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_writepages_result,
-+	TP_PROTO(struct inode *inode, struct writeback_control *wbc,
-+			int ret, int pages_written),
-+
-+	TP_ARGS(inode, wbc, ret, pages_written),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(long, pages_skipped, wbc->pages_skipped)
-+		ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, ret, ret)
-+		ctf_integer(int, pages_written, pages_written)
-+		ctf_integer(int, sync_mode, wbc->sync_mode)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
- 	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map),
- 
-@@ -305,7 +525,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
- 	)
- )
- 
--LTTNG_TRACEPOINT_EVENT(ext4_da_writepages_result,
-+LTTNG_TRACEPOINT_EVENT(ext4_writepages_result,
- 	TP_PROTO(struct inode *inode, struct writeback_control *wbc,
- 			int ret, int pages_written),
- 
-@@ -321,8 +541,36 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_writepages_result,
- 		ctf_integer(int, sync_mode, wbc->sync_mode)
- 	)
- )
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__folio_op,
-+	TP_PROTO(struct inode *inode, struct folio *folio),
-+
-+	TP_ARGS(inode, folio),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(pgoff_t, index, folio->index)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__folio_op, ext4_read_folio,
-+
-+	TP_PROTO(struct inode *inode, struct folio *folio),
-+
-+	TP_ARGS(inode, folio)
-+)
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,5,0))
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__folio_op, ext4_release_folio,
-+
-+	TP_PROTO(struct inode *inode, struct folio *folio),
-+
-+	TP_ARGS(inode, folio)
-+)
-+
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,5,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(ext4__folio_op,
- 	TP_PROTO(struct inode *inode, struct folio *folio),
- 
-@@ -391,6 +639,33 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4_invalidate_folio_op,
- 
- 	TP_ARGS(folio, offset, length),
- 
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, folio->mapping->host->i_ino)
-+		ctf_integer(pgoff_t, index, folio->index)
-+		ctf_integer(size_t, offset, offset)
-+		ctf_integer(size_t, length, length)
-+		ctf_integer(dev_t, dev, folio->mapping->host->i_sb->s_dev)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4_invalidate_folio_op, ext4_invalidate_folio,
-+	TP_PROTO(struct folio *folio, size_t offset, size_t length),
-+
-+	TP_ARGS(folio, offset, length)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4_invalidate_folio_op, ext4_journalled_invalidate_folio,
-+	TP_PROTO(struct folio *folio, size_t offset, size_t length),
-+
-+	TP_ARGS(folio, offset, length)
-+)
-+
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4_invalidate_folio_op,
-+	TP_PROTO(struct folio *folio, size_t offset, size_t length),
-+
-+	TP_ARGS(folio, offset, length),
-+
- 	TP_FIELDS(
- 		ctf_integer(dev_t, dev, folio->mapping->host->i_sb->s_dev)
- 		ctf_integer(ino_t, ino, folio->mapping->host->i_ino)
-@@ -454,6 +729,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_discard_blocks,
- 	)
- )
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mb_new_pa,
- 	TP_PROTO(struct ext4_allocation_context *ac,
- 		 struct ext4_prealloc_space *pa),
-@@ -461,10 +737,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mb_new_pa,
- 	TP_ARGS(ac, pa),
- 
- 	TP_FIELDS(
--		ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
--		ctf_integer(ino_t, ino, ac->ac_inode->i_ino)
-+		ctf_integer(u64, ino, ac->ac_inode->i_ino)
- 		ctf_integer(__u64, pa_pstart, pa->pa_pstart)
- 		ctf_integer(__u64, pa_lstart, pa->pa_lstart)
-+		ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
- 		ctf_integer(__u32, pa_len, pa->pa_len)
- 	)
- )
-@@ -493,15 +769,62 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
- 	TP_ARGS(pa, block, count),
- 
- 	TP_FIELDS(
--		ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
--		ctf_integer(ino_t, ino, pa->pa_inode->i_ino)
-+		ctf_integer(u64, ino, pa->pa_inode->i_ino)
- 		ctf_integer(__u64, block, block)
-+		ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
- 		ctf_integer(__u32, count, count)
- 	)
- )
-+#else
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mb_new_pa,
-+	TP_PROTO(struct ext4_allocation_context *ac,
-+		 struct ext4_prealloc_space *pa),
-+
-+	TP_ARGS(ac, pa),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
-+		ctf_integer(ino_t, ino, ac->ac_inode->i_ino)
-+		ctf_integer(__u64, pa_pstart, pa->pa_pstart)
-+		ctf_integer(__u64, pa_lstart, pa->pa_lstart)
-+		ctf_integer(__u32, pa_len, pa->pa_len)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mb_new_pa, ext4_mb_new_inode_pa,
-+
-+	TP_PROTO(struct ext4_allocation_context *ac,
-+		 struct ext4_prealloc_space *pa),
-+
-+	TP_ARGS(ac, pa)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mb_new_pa, ext4_mb_new_group_pa,
-+
-+	TP_PROTO(struct ext4_allocation_context *ac,
-+		 struct ext4_prealloc_space *pa),
-+
-+	TP_ARGS(ac, pa)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
-+	TP_PROTO(
-+		 struct ext4_prealloc_space *pa,
-+		 unsigned long long block, unsigned int count),
-+
-+	TP_ARGS(pa, block, count),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
-+		ctf_integer(ino_t, ino, pa->pa_inode->i_ino)
-+		ctf_integer(__u64, block, block)
-+		ctf_integer(__u32, count, count)
-+	)
-+)
-+#endif
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
- 
--LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
--
- 	TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
- 
- 	TP_ARGS(sb, pa),
-@@ -513,7 +836,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
- 	)
- )
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
-+	TP_PROTO(struct inode *inode, unsigned int len),
-+
-+	TP_ARGS(inode, len),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, len, len)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
- LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
- 	TP_PROTO(struct inode *inode, unsigned int len),
- 
-@@ -563,6 +898,87 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_discard_preallocations,
- 	)
- )
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_request_blocks,
-+	TP_PROTO(struct ext4_allocation_request *ar),
-+
-+	TP_ARGS(ar),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, ar->inode->i_ino)
-+		ctf_integer(__u64, goal, ar->goal)
-+		ctf_integer(__u64, pleft, ar->pleft)
-+		ctf_integer(__u64, pright, ar->pright)
-+		ctf_integer(dev_t, dev, ar->inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, len, ar->len)
-+		ctf_integer(__u32, logical, ar->logical)
-+		ctf_integer(__u32, lleft, ar->lleft)
-+		ctf_integer(__u32, lright, ar->lright)
-+		ctf_integer(unsigned int, flags, ar->flags)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_allocate_blocks,
-+	TP_PROTO(struct ext4_allocation_request *ar, unsigned long long block),
-+
-+	TP_ARGS(ar, block),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, ar->inode->i_ino)
-+		ctf_integer(__u64, block, block)
-+		ctf_integer(__u64, goal, ar->goal)
-+		ctf_integer(__u64, pleft, ar->pleft)
-+		ctf_integer(__u64, pright, ar->pright)
-+		ctf_integer(dev_t, dev, ar->inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, len, ar->len)
-+		ctf_integer(__u32, logical, ar->logical)
-+		ctf_integer(__u32, lleft, ar->lleft)
-+		ctf_integer(__u32, lright, ar->lright)
-+		ctf_integer(unsigned int, flags, ar->flags)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_free_blocks,
-+	TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
-+		 int flags),
-+
-+	TP_ARGS(inode, block, count, flags),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, block, block)
-+		ctf_integer(unsigned long, count, count)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, flags, flags)
-+		ctf_integer(TP_MODE_T, mode, inode->i_mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_sync_file_enter,
-+	TP_PROTO(struct file *file, int datasync),
-+
-+	TP_ARGS(file, datasync),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, file->f_path.dentry->d_inode->i_ino)
-+		ctf_integer(u64, parent, file->f_path.dentry->d_parent->d_inode->i_ino)
-+		ctf_integer(dev_t, dev, file->f_path.dentry->d_inode->i_sb->s_dev)
-+		ctf_integer(int, datasync, datasync)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit,
-+	TP_PROTO(struct inode *inode, int ret),
-+
-+	TP_ARGS(inode, ret),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, ret, ret)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_request_blocks,
- 	TP_PROTO(struct ext4_allocation_request *ar),
- 
-@@ -642,6 +1058,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit,
- 		ctf_integer(int, ret, ret)
- 	)
- )
-+#endif
- 
- LTTNG_TRACEPOINT_EVENT(ext4_sync_fs,
- 	TP_PROTO(struct super_block *sb, int wait),
-@@ -655,7 +1072,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_sync_fs,
- 	)
- )
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
-+	TP_PROTO(struct inode *inode),
-+
-+	TP_ARGS(inode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0))
- LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
- 	TP_PROTO(struct inode *inode),
- 
-@@ -682,6 +1111,109 @@ LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
- )
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_mballoc_alloc,
-+	TP_PROTO(struct ext4_allocation_context *ac),
-+
-+	TP_ARGS(ac),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, ac->ac_inode->i_ino)
-+		ctf_integer(dev_t, dev, ac->ac_inode->i_sb->s_dev)
-+		ctf_integer(__u32, orig_logical, ac->ac_o_ex.fe_logical)
-+		ctf_integer(int, orig_start, ac->ac_o_ex.fe_start)
-+		ctf_integer(__u32, orig_group, ac->ac_o_ex.fe_group)
-+		ctf_integer(int, orig_len, ac->ac_o_ex.fe_len)
-+		ctf_integer(__u32, goal_logical, ac->ac_g_ex.fe_logical)
-+		ctf_integer(int, goal_start, ac->ac_g_ex.fe_start)
-+		ctf_integer(__u32, goal_group, ac->ac_g_ex.fe_group)
-+		ctf_integer(int, goal_len, ac->ac_g_ex.fe_len)
-+		ctf_integer(__u32, result_logical, ac->ac_f_ex.fe_logical)
-+		ctf_integer(int, result_start, ac->ac_f_ex.fe_start)
-+		ctf_integer(__u32, result_group, ac->ac_f_ex.fe_group)
-+		ctf_integer(int, result_len, ac->ac_f_ex.fe_len)
-+		ctf_integer(__u16, found, ac->ac_found)
-+		ctf_integer(__u16, groups, ac->ac_groups_scanned)
-+		ctf_integer(__u16, buddy, ac->ac_buddy)
-+		ctf_integer(__u16, flags, ac->ac_flags)
-+		ctf_integer(__u16, tail, ac->ac_tail)
-+		ctf_integer(__u8, cr, ac->ac_criteria)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_mballoc_prealloc,
-+	TP_PROTO(struct ext4_allocation_context *ac),
-+
-+	TP_ARGS(ac),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, ac->ac_inode->i_ino)
-+		ctf_integer(dev_t, dev, ac->ac_inode->i_sb->s_dev)
-+		ctf_integer(__u32, orig_logical, ac->ac_o_ex.fe_logical)
-+		ctf_integer(int, orig_start, ac->ac_o_ex.fe_start)
-+		ctf_integer(__u32, orig_group, ac->ac_o_ex.fe_group)
-+		ctf_integer(int, orig_len, ac->ac_o_ex.fe_len)
-+		ctf_integer(__u32, result_logical, ac->ac_b_ex.fe_logical)
-+		ctf_integer(int, result_start, ac->ac_b_ex.fe_start)
-+		ctf_integer(__u32, result_group, ac->ac_b_ex.fe_group)
-+		ctf_integer(int, result_len, ac->ac_b_ex.fe_len)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc,
-+	TP_PROTO(struct super_block *sb,
-+		 struct inode *inode,
-+		 ext4_group_t group,
-+		 ext4_grpblk_t start,
-+		 ext4_grpblk_t len),
-+
-+	TP_ARGS(sb, inode, group, start, len),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode ? inode->i_ino : 0)
-+		ctf_integer(dev_t, dev, sb->s_dev)
-+		ctf_integer(int, result_start, start)
-+		ctf_integer(__u32, result_group, group)
-+		ctf_integer(int, result_len, len)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard,
-+
-+	TP_PROTO(struct super_block *sb,
-+		 struct inode *inode,
-+		 ext4_group_t group,
-+		 ext4_grpblk_t start,
-+		 ext4_grpblk_t len),
-+
-+	TP_ARGS(sb, inode, group, start, len)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free,
-+
-+	TP_PROTO(struct super_block *sb,
-+		 struct inode *inode,
-+		 ext4_group_t group,
-+		 ext4_grpblk_t start,
-+		 ext4_grpblk_t len),
-+
-+	TP_ARGS(sb, inode, group, start, len)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_forget,
-+	TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
-+
-+	TP_ARGS(inode, is_metadata, block),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, block, block)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, is_metadata, is_metadata)
-+		ctf_integer(TP_MODE_T, mode, inode->i_mode)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_mballoc_alloc,
- 	TP_PROTO(struct ext4_allocation_context *ac),
- 
-@@ -783,8 +1315,26 @@ LTTNG_TRACEPOINT_EVENT(ext4_forget,
- 		ctf_integer(TP_MODE_T, mode, inode->i_mode)
- 	)
- )
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
-+	TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0))
-+	TP_ARGS(inode, used_blocks, quota_claim),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, i_blocks, inode->i_blocks)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, used_blocks, used_blocks)
-+		ctf_integer(int, reserved_data_blocks,
-+				EXT4_I(inode)->i_reserved_data_blocks)
-+		ctf_integer(int, quota_claim, quota_claim)
-+		ctf_integer(TP_MODE_T, mode, inode->i_mode)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0))
- LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
- 	TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
- 
-@@ -824,7 +1374,23 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
-+	TP_PROTO(struct inode *inode, int nr_resv),
-+
-+	TP_ARGS(inode, nr_resv),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, i_blocks, inode->i_blocks)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, reserve_blocks, nr_resv)
-+		ctf_integer(int, reserved_data_blocks,
-+				EXT4_I(inode)->i_reserved_data_blocks)
-+		ctf_integer(TP_MODE_T, mode, inode->i_mode)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0))
- LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
- 	TP_PROTO(struct inode *inode, int nr_resv),
- 
-@@ -874,7 +1440,23 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
-+	TP_PROTO(struct inode *inode, int freed_blocks),
-+
-+	TP_ARGS(inode, freed_blocks),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, i_blocks, inode->i_blocks)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, freed_blocks, freed_blocks)
-+		ctf_integer(int, reserved_data_blocks,
-+				EXT4_I(inode)->i_reserved_data_blocks)
-+		ctf_integer(TP_MODE_T, mode, inode->i_mode)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,13,0))
- LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
- 	TP_PROTO(struct inode *inode, int freed_blocks),
- 
-@@ -910,91 +1492,309 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
- 		ctf_integer(TP_MODE_T, mode, inode->i_mode)
- 	)
- )
--#endif
-+#endif
-+
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__bitmap_load,
-+	TP_PROTO(struct super_block *sb, unsigned long group),
-+
-+	TP_ARGS(sb, group),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, sb->s_dev)
-+		ctf_integer(__u32, group, group)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_bitmap_load,
-+
-+	TP_PROTO(struct super_block *sb, unsigned long group),
-+
-+	TP_ARGS(sb, group)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
-+
-+	TP_PROTO(struct super_block *sb, unsigned long group),
-+
-+	TP_ARGS(sb, group)
-+)
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_read_block_bitmap_load,
-+	TP_PROTO(struct super_block *sb, unsigned long group, bool prefetch),
-+
-+	TP_ARGS(sb, group, prefetch),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, sb->s_dev)
-+		ctf_integer(__u32, group, group)
-+		ctf_integer(bool, prefetch, prefetch)
-+	)
-+)
-+#else
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load,
-+
-+	TP_PROTO(struct super_block *sb, unsigned long group),
-+
-+	TP_ARGS(sb, group)
-+)
-+#endif
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_load_inode_bitmap,
-+
-+	TP_PROTO(struct super_block *sb, unsigned long group),
-+
-+	TP_ARGS(sb, group)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_direct_IO_enter,
-+	TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
-+
-+	TP_ARGS(inode, offset, len, rw),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ino_t, ino, inode->i_ino)
-+		ctf_integer(loff_t, pos, offset)
-+		ctf_integer(unsigned long, len, len)
-+		ctf_integer(int, rw, rw)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_direct_IO_exit,
-+	TP_PROTO(struct inode *inode, loff_t offset, unsigned long len,
-+		 int rw, int ret),
-+
-+	TP_ARGS(inode, offset, len, rw, ret),
-+
-+	TP_FIELDS(
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ino_t, ino, inode->i_ino)
-+		ctf_integer(loff_t, pos, offset)
-+		ctf_integer(unsigned long, len, len)
-+		ctf_integer(int, rw, rw)
-+		ctf_integer(int, ret, ret)
-+	)
-+)
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_fallocate_exit,
-+	TP_PROTO(struct inode *inode, loff_t offset,
-+		 unsigned int max_blocks, int ret),
-+
-+	TP_ARGS(inode, offset, max_blocks, ret),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, pos, offset)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, blocks, max_blocks)
-+		ctf_integer(int, ret, ret)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__fallocate_mode,
-+	TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
-+
-+	TP_ARGS(inode, offset, len, mode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(loff_t, pos, offset)
-+		ctf_integer(loff_t, len, len)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, mode, mode)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_fallocate_enter,
-+
-+	TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
-+
-+	TP_ARGS(inode, offset, len, mode)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_punch_hole,
-+
-+	TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
-+
-+	TP_ARGS(inode, offset, len, mode)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_zero_range,
-+
-+	TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
-+
-+	TP_ARGS(inode, offset, len, mode)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_unlink_enter,
-+	TP_PROTO(struct inode *parent, struct dentry *dentry),
-+
-+	TP_ARGS(parent, dentry),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, dentry->d_inode->i_ino)
-+		ctf_integer(u64, parent, parent->i_ino)
-+		ctf_integer(loff_t, size, dentry->d_inode->i_size)
-+		ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_unlink_exit,
-+	TP_PROTO(struct dentry *dentry, int ret),
-+
-+	TP_ARGS(dentry, ret),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, dentry->d_inode->i_ino)
-+		ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev)
-+		ctf_integer(int, ret, ret)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__truncate,
-+	TP_PROTO(struct inode *inode),
-+
-+	TP_ARGS(inode),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(__u64, blocks, inode->i_blocks)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__truncate, ext4_truncate_enter,
-+
-+	TP_PROTO(struct inode *inode),
-+
-+	TP_ARGS(inode)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__truncate, ext4_truncate_exit,
-+
-+	TP_PROTO(struct inode *inode),
-+
-+	TP_ARGS(inode)
-+)
-+
-+/* 'ux' is the uninitialized extent. */
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_enter,
-+	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
-+		 struct ext4_extent *ux),
-+
-+	TP_ARGS(inode, map, ux),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, u_pblk, ext4_ext_pblock(ux))
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, m_lblk, map->m_lblk)
-+		ctf_integer(unsigned, m_len, map->m_len)
-+		ctf_integer(ext4_lblk_t, u_lblk, le32_to_cpu(ux->ee_block))
-+		ctf_integer(unsigned, u_len, ext4_ext_get_actual_len(ux))
-+	)
-+)
-+
-+/*
-+ * 'ux' is the uninitialized extent.
-+ * 'ix' is the initialized extent to which blocks are transferred.
-+ */
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_fastpath,
-+	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
-+		 struct ext4_extent *ux, struct ext4_extent *ix),
-+
-+	TP_ARGS(inode, map, ux, ix),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, u_pblk, ext4_ext_pblock(ux))
-+		ctf_integer(ext4_fsblk_t, i_pblk, ext4_ext_pblock(ix))
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, m_lblk, map->m_lblk)
-+		ctf_integer(unsigned, m_len, map->m_len)
-+		ctf_integer(ext4_lblk_t, u_lblk, le32_to_cpu(ux->ee_block))
-+		ctf_integer(unsigned, u_len, ext4_ext_get_actual_len(ux))
-+		ctf_integer(ext4_lblk_t, i_lblk, le32_to_cpu(ix->ee_block))
-+		ctf_integer(unsigned, i_len, ext4_ext_get_actual_len(ix))
-+	)
-+)
- 
--LTTNG_TRACEPOINT_EVENT_CLASS(ext4__bitmap_load,
--	TP_PROTO(struct super_block *sb, unsigned long group),
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_enter,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-+		 unsigned int len, unsigned int flags),
- 
--	TP_ARGS(sb, group),
-+	TP_ARGS(inode, lblk, len, flags),
- 
- 	TP_FIELDS(
--		ctf_integer(dev_t, dev, sb->s_dev)
--		ctf_integer(__u32, group, group)
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, lblk, lblk)
-+		ctf_integer(unsigned int, len, len)
-+		ctf_integer(unsigned int, flags, flags)
- 	)
- )
- 
--LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_bitmap_load,
--
--	TP_PROTO(struct super_block *sb, unsigned long group),
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_enter, ext4_ext_map_blocks_enter,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-+		 unsigned len, unsigned flags),
- 
--	TP_ARGS(sb, group)
-+	TP_ARGS(inode, lblk, len, flags)
- )
- 
--LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
--
--	TP_PROTO(struct super_block *sb, unsigned long group),
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_enter, ext4_ind_map_blocks_enter,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-+		 unsigned len, unsigned flags),
- 
--	TP_ARGS(sb, group)
-+	TP_ARGS(inode, lblk, len, flags)
- )
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0))
--LTTNG_TRACEPOINT_EVENT(ext4_read_block_bitmap_load,
--	TP_PROTO(struct super_block *sb, unsigned long group, bool prefetch),
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
-+	TP_PROTO(struct inode *inode, unsigned flags, struct ext4_map_blocks *map,
-+		 int ret),
- 
--	TP_ARGS(sb, group, prefetch),
-+	TP_ARGS(inode, flags, map, ret),
- 
- 	TP_FIELDS(
--		ctf_integer(dev_t, dev, sb->s_dev)
--		ctf_integer(__u32, group, group)
--		ctf_integer(bool, prefetch, prefetch)
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(unsigned int, flags, flags)
-+		ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
-+		ctf_integer(unsigned int, len, map->m_len)
-+		ctf_integer(unsigned int, mflags, map->m_flags)
-+		ctf_integer(int, ret, ret)
- 	)
- )
--#else
--LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load,
--
--	TP_PROTO(struct super_block *sb, unsigned long group),
--
--	TP_ARGS(sb, group)
--)
--#endif
--
--LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_load_inode_bitmap,
- 
--	TP_PROTO(struct super_block *sb, unsigned long group),
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
-+	TP_PROTO(struct inode *inode, unsigned flags,
-+		 struct ext4_map_blocks *map, int ret),
- 
--	TP_ARGS(sb, group)
-+	TP_ARGS(inode, flags, map, ret)
- )
- 
--LTTNG_TRACEPOINT_EVENT(ext4_direct_IO_enter,
--	TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
--
--	TP_ARGS(inode, offset, len, rw),
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
-+	TP_PROTO(struct inode *inode, unsigned flags,
-+		 struct ext4_map_blocks *map, int ret),
- 
--	TP_FIELDS(
--		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
--		ctf_integer(ino_t, ino, inode->i_ino)
--		ctf_integer(loff_t, pos, offset)
--		ctf_integer(unsigned long, len, len)
--		ctf_integer(int, rw, rw)
--	)
-+	TP_ARGS(inode, flags, map, ret)
- )
- 
--LTTNG_TRACEPOINT_EVENT(ext4_direct_IO_exit,
--	TP_PROTO(struct inode *inode, loff_t offset, unsigned long len,
--		 int rw, int ret),
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk),
- 
--	TP_ARGS(inode, offset, len, rw, ret),
-+	TP_ARGS(inode, lblk, pblk),
- 
- 	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, pblk, pblk)
- 		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
--		ctf_integer(ino_t, ino, inode->i_ino)
--		ctf_integer(loff_t, pos, offset)
--		ctf_integer(unsigned long, len, len)
--		ctf_integer(int, rw, rw)
--		ctf_integer(int, ret, ret)
-+		ctf_integer(ext4_lblk_t, lblk, lblk)
- 	)
- )
--
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_fallocate_exit,
- 	TP_PROTO(struct inode *inode, loff_t offset,
- 		 unsigned int max_blocks, int ret),
-@@ -1211,8 +2011,20 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent,
- 		ctf_integer(ext4_lblk_t, lblk, lblk)
- 	)
- )
-+#endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
-+	TP_PROTO(struct super_block *sb, unsigned long ino),
-+
-+	TP_ARGS(sb, ino),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, ino)
-+		ctf_integer(dev_t, dev, sb->s_dev)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
- LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
- 	TP_PROTO(struct super_block *sb, unsigned long ino),
- 
-@@ -1295,7 +2107,26 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
- )
- #endif
- 
--LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_uninitialized_extents,
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_unwritten_extents,
-+	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
-+		 unsigned int allocated, ext4_fsblk_t newblock),
-+
-+	TP_ARGS(inode, map, flags, allocated, newblock),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
-+		ctf_integer(ext4_fsblk_t, newblk, newblock)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(int, flags, flags)
-+		ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
-+		ctf_integer(unsigned int, len, map->m_len)
-+		ctf_integer(unsigned int, allocated, allocated)
-+	)
-+)
-+#else
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_unwritten_extents,
- 	TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
- 		 unsigned int allocated, ext4_fsblk_t newblock),
- 
-@@ -1312,6 +2143,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_uninitialized_extents,
- 		ctf_integer(ext4_fsblk_t, newblk, newblock)
- 	)
- )
-+#endif
- 
- LTTNG_TRACEPOINT_EVENT(ext4_get_implied_cluster_alloc_exit,
- 	TP_PROTO(struct super_block *sb, struct ext4_map_blocks *map, int ret),
-@@ -1386,6 +2218,22 @@ LTTNG_TRACEPOINT_EVENT(ext4_get_reserved_cluster_alloc,
- 	)
- )
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,
-+		 unsigned short len),
-+
-+	TP_ARGS(inode, lblk, pblk, len),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, pblk, pblk)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, lblk, lblk)
-+		ctf_integer(unsigned short, len, len)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent,
- 	TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,
- 		 unsigned short len),
-@@ -1400,8 +2248,32 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent,
- 		ctf_integer(unsigned short, len, len)
- 	)
- )
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
-+	TP_PROTO(struct inode *inode, struct ext4_extent *ex,
-+		 ext4_lblk_t from, ext4_fsblk_t to,
-+		 struct partial_cluster *pc),
-+
-+	TP_ARGS(inode, ex, from, to, pc),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
-+		ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, from, from)
-+		ctf_integer(ext4_lblk_t, to, to)
-+		ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
-+		ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex))
-+		ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
-+		ctf_integer(int, pc_state, pc->state)
-+	)
-+)
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,20,0) || \
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,20,0) || \
- 	LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
- 
- LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
-@@ -1448,7 +2320,28 @@ LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
- 
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,20,0) || \
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t start,
-+		 struct ext4_extent *ex,
-+		 struct partial_cluster *pc),
-+
-+	TP_ARGS(inode, start, ex, pc),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
-+		ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, start, start)
-+		ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
-+		ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex))
-+		ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
-+		ctf_integer(int, pc_state, pc->state)
-+	)
-+)
-+
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,20,0) || \
- 	LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
- 
- LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
-@@ -1493,6 +2386,34 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
- 
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_idx,
-+	TP_PROTO(struct inode *inode, ext4_fsblk_t pblk),
-+
-+	TP_ARGS(inode, pblk),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, pblk, pblk)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t start,
-+		 ext4_lblk_t end, int depth),
-+
-+	TP_ARGS(inode, start, end, depth),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, start, start)
-+		ctf_integer(ext4_lblk_t, end, end)
-+		ctf_integer(int, depth, depth)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_idx,
- 	TP_PROTO(struct inode *inode, ext4_fsblk_t pblk),
- 
-@@ -1519,8 +2440,30 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
- 		ctf_integer(int, depth, depth)
- 	)
- )
-+#endif
-+
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+
-+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
-+	TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
-+		 int depth, struct partial_cluster *pc, __le16 eh_entries),
-+
-+	TP_ARGS(inode, start, end, depth, pc, eh_entries),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, start, start)
-+		ctf_integer(ext4_lblk_t, end, end)
-+		ctf_integer(int, depth, depth)
-+		ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
-+		ctf_integer(int, pc_state, pc->state)
-+		ctf_integer(unsigned short, eh_entries, le16_to_cpu(eh_entries))
-+	)
-+)
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,20,0) || \
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,20,0) || \
- 	LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
- 
- LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
-@@ -1563,6 +2506,35 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
- 
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__es_extent,
-+	TP_PROTO(struct inode *inode, struct extent_status *es),
-+
-+	TP_ARGS(inode, es),
-+
-+	TP_FIELDS(
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(u64, seq, EXT4_I(inode)->i_es_seq)
-+		ctf_integer(ext4_fsblk_t, pblk, ext4_es_show_pblock(es))
-+		ctf_integer(dev_t, dev, inode->i_sb->s_dev)
-+		ctf_integer(ext4_lblk_t, lblk, es->es_lblk)
-+		ctf_integer(ext4_lblk_t, len, es->es_len)
-+		ctf_integer(char, status, ext4_es_status(es))
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_insert_extent,
-+	TP_PROTO(struct inode *inode, struct extent_status *es),
-+
-+	TP_ARGS(inode, es)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_cache_extent,
-+	TP_PROTO(struct inode *inode, struct extent_status *es),
-+
-+	TP_ARGS(inode, es)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(ext4__es_extent,
- 	TP_PROTO(struct inode *inode, struct extent_status *es),
- 
-@@ -1589,6 +2561,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_cache_extent,
- 
- 	TP_ARGS(inode, es)
- )
-+#endif
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
- LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan,
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch
deleted file mode 100644
index e9c9e5957a..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From faf9b9d9584ef6615243dc123f7c14ab01b0e7c3 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 10:54:27 -0400
-Subject: [PATCH] fix: hrtimer: Drop unnecessary pointer indirection in
- hrtimer_expire_entry event (v7.1)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-See upstream commit:
-
-  commit bd803783dfa7ddd5e1d44a6abfeee26fdc3a2db7
-  Author: Thomas Weißschuh (Schneider Electric) <thomas.weissschuh@linutronix.de>
-  Date:   Wed Mar 11 11:15:18 2026 +0100
-
-    hrtimer: Drop unnecessary pointer indirection in hrtimer_expire_entry event
-
-    This pointer indirection is a remnant from when ktime_t was a struct,
-    today it is pointless.
-
-    Drop the pointer indirection.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17888]
-
-Change-Id: I58187dd1396dbdbda4ba0a00aa533deb415605d1
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/timer.h | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h
-index dfc295e..c4a9460 100644
---- a/include/instrumentation/events/timer.h
-+++ b/include/instrumentation/events/timer.h
-@@ -299,6 +299,29 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
- )
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+/**
-+ * htimmer_expire_entry - called immediately before the hrtimer callback
-+ * @timer:	pointer to struct hrtimer
-+ * @now:	variable which contains current time of the timers base.
-+ *
-+ * Allows to determine the timer latency.
-+ */
-+LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry,
-+
-+	timer_hrtimer_expire_entry,
-+
-+	TP_PROTO(struct hrtimer *hrtimer, ktime_t now),
-+
-+	TP_ARGS(hrtimer, now),
-+
-+	TP_FIELDS(
-+		ctf_integer_hex(void *, hrtimer, hrtimer)
-+		ctf_integer(s64, now, lttng_ktime_get_tv64(now))
-+		ctf_integer_hex(void *, function, hrtimer->function)
-+	)
-+)
-+#else
- /**
-  * htimmer_expire_entry - called immediately before the hrtimer callback
-  * @timer:	pointer to struct hrtimer
-@@ -321,6 +344,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry,
- 		ctf_integer_hex(void *, function, hrtimer->function)
- 	)
- )
-+#endif
- 
- LTTNG_TRACEPOINT_EVENT_CLASS(timer_hrtimer_class,
- 
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch
deleted file mode 100644
index 6dd794f460..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 82000f32ec1c54a83e95ce10aefedfd6c41ec4bd Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 10:38:18 -0400
-Subject: [PATCH] fix: hrtimer: Reduce trace noise in hrtimer_start() (v7.1)
-
-See upstream commit:
-
-  commit f2e388a019e4cf83a15883a3d1f1384298e9a6aa
-  Author: Thomas Gleixner <tglx@kernel.org>
-  Date:   Tue Feb 24 17:36:59 2026 +0100
-
-    hrtimer: Reduce trace noise in hrtimer_start()
-
-    hrtimer_start() when invoked with an already armed timer traces like:
-
-     <comm>-..   [032] d.h2. 5.002263: hrtimer_cancel: hrtimer= ....
-     <comm>-..   [032] d.h1. 5.002263: hrtimer_start: hrtimer= ....
-
-    Which is incorrect as the timer doesn't get canceled. Just the expiry time
-    changes. The internal dequeue operation which is required for that is not
-    really interesting for trace analysis. But it makes it tedious to keep real
-    cancellations and the above case apart.
-
-    Remove the cancel tracing in hrtimer_start() and add a 'was_armed'
-    indicator to the hrtimer start tracepoint, which clearly indicates what the
-    state of the hrtimer is when hrtimer_start() is invoked:
-
-    <comm>-..   [032] d.h1. 6.200103: hrtimer_start: hrtimer= .... was_armed=0
-     <comm>-..   [032] d.h1. 6.200558: hrtimer_start: hrtimer= .... was_armed=1
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17887]
-
-Change-Id: I37ee0ae0af665a51fd4f92adffb6b1dcb2ecd9d2
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/timer.h | 39 ++++++++++++++++++++++++--
- 1 file changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h
-index f69e069..dfc295e 100644
---- a/include/instrumentation/events/timer.h
-+++ b/include/instrumentation/events/timer.h
-@@ -220,12 +220,43 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init,
- 	)
- )
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0) || \
-+	LTTNG_KERNEL_RANGE(7,0,10, 7,1,0) || \
-+	LTTNG_KERNEL_RANGE(6,18,33, 6,19,0) || \
-+	LTTNG_KERNEL_RANGE(6,12,91, 6,13,0) || \
-+	LTTNG_KERNEL_RANGE(6,6,141, 6,7,0))
- /**
-  * hrtimer_start - called when the hrtimer is started
-- * @timer: pointer to struct hrtimer
-+ * @hrtimer:	pointer to struct hrtimer
-+ * @mode:	the hrtimers mode
-+ * @was_armed:	Was armed when hrtimer_start*() was invoked
-  */
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0) || \
-+LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
-+
-+	timer_hrtimer_start,
-+
-+	TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_mode mode, bool was_armed),
-+
-+	TP_ARGS(hrtimer, mode, was_armed),
-+
-+	TP_FIELDS(
-+		ctf_integer_hex(void *, hrtimer, hrtimer)
-+		ctf_integer_hex(void *, function, hrtimer->function)
-+		ctf_integer(s64, expires,
-+			lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer)))
-+		ctf_integer(s64, softexpires,
-+			lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer)))
-+		ctf_enum(hrtimer_mode, unsigned int, mode, mode)
-+		ctf_integer(bool, was_armed, was_armed)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0) || \
- 	LTTNG_RT_KERNEL_RANGE(4,14,0,0, 4,15,0,0))
-+/**
-+ * hrtimer_start - called when the hrtimer is started
-+ * @hrtimer:	pointer to struct hrtimer
-+ * @mode:	the hrtimers mode
-+ */
- LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
- 
- 	timer_hrtimer_start,
-@@ -245,6 +276,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
- 	)
- )
- #else
-+/**
-+ * hrtimer_start - called when the hrtimer is started
-+ * @hrtimer: pointer to struct hrtimer
-+ */
- LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
- 
- 	timer_hrtimer_start,
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch
deleted file mode 100644
index 660c7a43a8..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 62aa0b4bba7e3b0c60f0bcdb5c98c77bedcd45ba Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 11:36:32 -0400
-Subject: [PATCH] fix: mm/vmscan: Convert pageout() to take a folio (v5.18)
-
-See upstream commit:
-
-  commit e0cd5e7ffa549487cf1a85452f371274cbf0a8f1
-  Author: Matthew Wilcox (Oracle) <willy@infradead.org>
-  Date:   Mon Jan 17 23:35:57 2022 -0500
-
-    mm/vmscan: Convert pageout() to take a folio
-
-    We always write out an entire folio at once.  This conversion removes
-    a few calls to compound_head() and gets the NR_VMSCAN_WRITE statistic
-    right when writing out a large folio.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17890]
-
-Change-Id: I43ce035aecbfb3f640d2af32224be71067762711
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/mm_vmscan.h | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/include/instrumentation/events/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h
-index 15d56b3..f33bcbd 100644
---- a/include/instrumentation/events/mm_vmscan.h
-+++ b/include/instrumentation/events/mm_vmscan.h
-@@ -510,7 +510,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
-+LTTNG_TRACEPOINT_EVENT(mm_vmscan_write_folio,
-+
-+	TP_PROTO(struct folio *folio),
-+
-+	TP_ARGS(folio),
-+
-+	TP_FIELDS(
-+		ctf_integer_hex(unsigned long, pfn, folio_pfn(folio))
-+		ctf_integer(int, reclaim_flags, trace_reclaim_flags(
-+				folio_is_file_lru(folio)))
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0))
- LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
- 
- 	TP_PROTO(struct page *page),
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints-v7.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints-v7.1.patch
deleted file mode 100644
index 506004a3c6..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints-v7.1.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From c3dac15e9e2be4ab818b59a74fda26466cc16c2c Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 11:30:54 -0400
-Subject: [PATCH] fix: mm: vmscan: add cgroup IDs to vmscan tracepoints (v7.1)
-
-See upstream commit:
-
-  commit 874a0a566ede40f3d6062cae8fe1022e616edd1a
-  Author: Thomas Ballasi <tballasi@linux.microsoft.com>
-  Date:   Mon Mar 16 09:09:07 2026 -0700
-
-    mm: vmscan: add cgroup IDs to vmscan tracepoints
-
-    Memory reclaim events are currently difficult to attribute to specific
-    cgroups, making debugging memory pressure issues challenging.  This patch
-    adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable
-    better correlation and analysis.
-
-    For operations not associated with a specific cgroup, the field is
-    defaulted to 0.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17889]
-
-Change-Id: Ib1663810300b08e599f9c144930ae156e1efbaf9
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/mm_vmscan.h | 125 ++++++++++++++++++++-
- 1 file changed, 123 insertions(+), 2 deletions(-)
-
-diff --git a/include/instrumentation/events/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h
-index f33bcbd..cce0619 100644
---- a/include/instrumentation/events/mm_vmscan.h
-+++ b/include/instrumentation/events/mm_vmscan.h
-@@ -121,7 +121,43 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+
-+LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
-+
-+	TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(gfp_flags, order, memcg),
-+
-+	TP_FIELDS(
-+		ctf_integer(gfp_t, gfp_flags, gfp_flags)
-+		ctf_integer(int, order, order)
-+		ctf_integer(u64, memcg_id, mem_cgroup_id(memcg))
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
-+
-+	TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(gfp_flags, order, memcg)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin,
-+
-+	TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(gfp_flags, order, memcg)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin,
-+
-+	TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(gfp_flags, order, memcg)
-+)
-+
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \
- 	LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
- 
- LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
-@@ -232,6 +268,40 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmsc
- 
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,
-+
-+	TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(nr_reclaimed, memcg),
-+
-+	TP_FIELDS(
-+		ctf_integer(unsigned long, nr_reclaimed, nr_reclaimed)
-+		ctf_integer(u64, memcg_id, mem_cgroup_id(memcg))
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
-+
-+	TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(nr_reclaimed, memcg)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end,
-+
-+	TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(nr_reclaimed, memcg)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end,
-+
-+	TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(nr_reclaimed, memcg)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,
- 
- 	TP_PROTO(unsigned long nr_reclaimed),
-@@ -263,8 +333,35 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan
- 
- 	TP_ARGS(nr_reclaimed)
- )
-+#endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
-+
-+	mm_vmscan_shrink_slab_start,
-+
-+	TP_PROTO(struct shrinker *shr, struct shrink_control *sc,
-+		long nr_objects_to_shrink, unsigned long cache_items,
-+		unsigned long long delta, unsigned long total_scan,
-+		int priority, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan,
-+		priority, memcg),
-+
-+	TP_FIELDS(
-+		ctf_integer_hex(struct shrinker *, shr, shr)
-+		ctf_integer_hex(void *, shrink, shr->scan_objects)
-+		ctf_integer(int, nid, sc->nid)
-+		ctf_integer(long, nr_objects_to_shrink, nr_objects_to_shrink)
-+		ctf_integer(gfp_t, gfp_flags, sc->gfp_mask)
-+		ctf_integer(unsigned long, cache_items, cache_items)
-+		ctf_integer(unsigned long long, delta, delta)
-+		ctf_integer(unsigned long, total_scan, total_scan)
-+		ctf_integer(int, priority, priority)
-+		ctf_integer(u64, memcg_id, mem_cgroup_id(memcg))
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0))
- LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
- 
- 	mm_vmscan_shrink_slab_start,
-@@ -316,6 +413,29 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
- )
- #endif
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
-+
-+	mm_vmscan_shrink_slab_end,
-+
-+	TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval,
-+		long unused_scan_cnt, long new_scan_cnt, long total_scan, struct mem_cgroup *memcg),
-+
-+	TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt,
-+		total_scan, memcg),
-+
-+	TP_FIELDS(
-+		ctf_integer_hex(struct shrinker *, shr, shr)
-+		ctf_integer(int, nid, nid)
-+		ctf_integer_hex(void *, shrink, shr->scan_objects)
-+		ctf_integer(long, unused_scan, unused_scan_cnt)
-+		ctf_integer(long, new_scan, new_scan_cnt)
-+		ctf_integer(int, retval, shrinker_retval)
-+		ctf_integer(long, total_scan, total_scan)
-+		ctf_integer(u64, memcg_id, mem_cgroup_id(memcg))
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
- 
- 	mm_vmscan_shrink_slab_end,
-@@ -336,6 +456,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
- 		ctf_integer(long, total_scan, total_scan)
- 	)
- )
-+#endif
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) || \
-      LTTNG_RHEL_KERNEL_RANGE(5,14,0,427,16,1, 5,15,0,0,0,0))
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-treewide-change-inode-i_ino-from-unsigned-long-to-u64-v7.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-treewide-change-inode-i_ino-from-unsigned-long-to-u64-v7.1.patch
deleted file mode 100644
index a87ee574fb..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-treewide-change-inode-i_ino-from-unsigned-long-to-u64-v7.1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 69ee47280a495540d91718442a66af18362a4a26 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 14:52:02 -0400
-Subject: [PATCH] fix: treewide: change inode->i_ino from unsigned long to u64
- (v7.1)
-
-See upstream commit:
-
-  commit 0b2600f81cefcdfcda58d50df7be8fd48ada8ce2
-  Author: Jeff Layton <jlayton@kernel.org>
-  Date:   Wed Mar 4 10:32:42 2026 -0500
-
-    treewide: change inode->i_ino from unsigned long to u64
-
-    On 32-bit architectures, unsigned long is only 32 bits wide, which
-    causes 64-bit inode numbers to be silently truncated. Several
-    filesystems (NFS, XFS, BTRFS, etc.) can generate inode numbers that
-    exceed 32 bits, and this truncation can lead to inode number collisions
-    and other subtle bugs on 32-bit systems.
-
-    Change the type of inode->i_ino from unsigned long to u64 to ensure that
-    inode numbers are always represented as 64-bit values regardless of
-    architecture. Update all format specifiers treewide from %lu/%lx to
-    %llu/%llx to match the new type, along with corresponding local variable
-    types.
-
-    This is the bulk treewide conversion. Earlier patches in this series
-    handled trace events separately to allow trace field reordering for
-    better struct packing on 32-bit.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17905]
-
-Change-Id: I027477ced731f74999ae40bc9b66bf9d2f295cbb
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- src/lttng-uprobes.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lttng-uprobes.c b/src/lttng-uprobes.c
-index 39c09b8..84edbd3 100644
---- a/src/lttng-uprobes.c
-+++ b/src/lttng-uprobes.c
-@@ -256,8 +256,8 @@ int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe,
- 		      uprobe_handler->offset, &uprobe_handler->up_consumer);
- #endif
- 	if (ret) {
--		printk(KERN_WARNING "LTTng: Error registering probe on inode %lu "
--		       "and offset 0x%llx\n", uprobe->inode->i_ino,
-+		printk(KERN_WARNING "LTTng: Error registering probe on inode %llu "
-+		       "and offset 0x%llx\n", (u64) uprobe->inode->i_ino,
- 		       uprobe_handler->offset);
- 		ret = -1;
- 		goto register_error;
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-vfs-widen-trace-event-i_ino-fields-to-u64-v7.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-vfs-widen-trace-event-i_ino-fields-to-u64-v7.1.patch
deleted file mode 100644
index ee38b753f3..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-vfs-widen-trace-event-i_ino-fields-to-u64-v7.1.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-From 06f95d412fd63d4bd0ba2c24243a67808931f034 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 25 May 2026 11:37:51 -0400
-Subject: [PATCH] fix: vfs: widen trace event i_ino fields to u64 (v7.1)
-
-See upstream commit:
-
-  commit 5a3d5928b1a4196affc5f504fdf95f67f169bc57
-  Author: Jeff Layton <jlayton@kernel.org>
-  Date:   Wed Mar 4 10:32:34 2026 -0500
-
-    vfs: widen trace event i_ino fields to u64
-
-    Update VFS-layer trace event definitions to use u64 instead of
-    ino_t/unsigned long for inode number fields. Update TP_printk format
-    strings to use %llu/%llx to match the widened field type. Remove
-    now-unnecessary (unsigned long) casts since __entry->ino is already
-    u64.
-
-Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/17891]
-
-Change-Id: Id48ff7ffe40528f839c84eaa060ab5cd67ea1436
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
----
- include/instrumentation/events/writeback.h | 179 ++++++++++++++++++++-
- 1 file changed, 174 insertions(+), 5 deletions(-)
-
-diff --git a/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h
-index f53d9d3..cbf9a42 100644
---- a/include/instrumentation/events/writeback.h
-+++ b/include/instrumentation/events/writeback.h
-@@ -35,6 +35,31 @@ static inline const char *lttng_bdi_dev_name(struct backing_dev_info *bdi)
- 	return dev_name(bdi->dev);
- }
- #endif
-+
-+#ifdef CONFIG_CGROUP_WRITEBACK
-+static inline u64 lttng_wb_assign_cgroup(struct bdi_writeback *wb)
-+{
-+	return cgroup_ino(wb->memcg_css->cgroup);
-+}
-+
-+static inline u64 lttng_wbc_assign_cgroup(struct writeback_control *wbc)
-+{
-+	if (wbc->wb)
-+		return lttng_wb_assign_cgroup(wbc->wb);
-+	else
-+		return 1;
-+}
-+#else   /* CONFIG_CGROUP_WRITEBACK */
-+static inline u64 lttng_wb_assign_cgroup(struct bdi_writeback *wb)
-+{
-+	return 1;
-+}
-+
-+static inline u64 lttng_wbc_assign_cgroup(struct writeback_control *wbc)
-+{
-+	return 1;
-+}
-+#endif  /* CONFIG_CGROUP_WRITEBACK */
- #endif
- 
- /*
-@@ -101,7 +126,36 @@ static inline const char *lttng_bdi_dev_name(struct backing_dev_info *bdi)
- 	)
- #endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0)) */
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(writeback_folio_template,
-+
-+	TP_PROTO(struct folio *folio, struct address_space *mapping),
-+
-+	TP_ARGS(folio, mapping),
-+
-+	TP_FIELDS(
-+		ctf_string(name, lttng_bdi_dev_name(mapping ? inode_to_bdi(mapping->host) : NULL))
-+		ctf_integer(u64, ino, (mapping && mapping->host) ? mapping->host->i_ino : 0)
-+		ctf_integer(pgoff_t, index, folio->index)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_folio_template, writeback_dirty_folio,
-+
-+	TP_PROTO(struct folio *folio, struct address_space *mapping),
-+
-+	TP_ARGS(folio, mapping)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(writeback_folio_template, folio_wait_writeback,
-+
-+	writeback_folio_wait,
-+
-+	TP_PROTO(struct folio *folio, struct address_space *mapping),
-+
-+	TP_ARGS(folio, mapping)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(writeback_folio_template,
- 
- 	TP_PROTO(struct folio *folio, struct address_space *mapping),
-@@ -168,7 +222,19 @@ LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(writeback_dirty_inode_template,
-+	TP_PROTO(struct inode *inode, int flags),
-+	TP_ARGS(inode, flags),
-+	TP_FIELDS(
-+		/* may be called for files on pseudo FSes w/ unregistered bdi */
-+		ctf_string(name, lttng_bdi_dev_name(inode_to_bdi(inode)))
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(unsigned long, state, inode_state_read_once(inode))
-+		ctf_integer(unsigned long, flags, flags)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(writeback_dirty_inode_template,
- 	TP_PROTO(struct inode *inode, int flags),
- 	TP_ARGS(inode, flags),
-@@ -202,6 +268,18 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(writeback_dirty_inode_star
- LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(writeback_dirty_inode)
- LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(writeback_mark_inode_dirty)
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(writeback_write_inode_template,
-+	TP_PROTO(struct inode *inode, struct writeback_control *wbc),
-+	TP_ARGS(inode, wbc),
-+	TP_FIELDS(
-+		ctf_string(name, lttng_bdi_dev_name(inode_to_bdi(inode)))
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(u64, cgroup_ino, lttng_wbc_assign_cgroup(wbc))
-+		ctf_integer(int, sync_mode, wbc->sync_mode)
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(writeback_write_inode_template,
- 	TP_PROTO(struct inode *inode, struct writeback_control *wbc),
- 	TP_ARGS(inode, wbc),
-@@ -211,6 +289,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(writeback_write_inode_template,
- 		ctf_integer(int, sync_mode, wbc->sync_mode)
- 	)
- )
-+#endif
- 
- #define LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(name) \
- LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_write_inode_template, name, \
-@@ -457,7 +536,53 @@ LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
- 	)
- )
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,15,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
-+
-+	writeback_balance_dirty_pages,
-+
-+	TP_PROTO(struct bdi_writeback *wb,
-+		 struct dirty_throttle_control *dtc,
-+		 unsigned long dirty_ratelimit,
-+		 unsigned long task_ratelimit,
-+		 unsigned long dirtied,
-+		 unsigned long period,
-+		 long pause,
-+		 unsigned long start_time),
-+
-+	TP_ARGS(wb, dtc, dirty_ratelimit, task_ratelimit,
-+		dirtied, period, pause, start_time
-+	),
-+
-+	TP_FIELDS(
-+		ctf_string(bdi, lttng_bdi_dev_name(wb->bdi))
-+		ctf_integer(u64, cgroup_ino, lttng_wb_assign_cgroup(wb))
-+		ctf_integer(unsigned long, limit, dtc->limit)
-+		ctf_integer(unsigned long, setpoint,
-+                    (dtc->limit + (dtc->thresh + dtc->bg_thresh)) / 2)
-+		ctf_integer(unsigned long, dirty, dtc->dirty)
-+		ctf_integer(unsigned long, wb_setpoint,
-+                    ((dtc->limit + (dtc->thresh + dtc->bg_thresh)) / 2)
-+                    * (dtc->wb_thresh / (dtc->thresh + 1)))
-+		ctf_integer(unsigned long, wb_dirty, dtc->wb_dirty)
-+		ctf_integer(unsigned long, dirty_ratelimit,
-+			KBps(dirty_ratelimit))
-+		ctf_integer(unsigned long, task_ratelimit,
-+			KBps(task_ratelimit))
-+		ctf_integer(unsigned long, paused,
-+			(jiffies - start_time) * 1000 / HZ)
-+		ctf_integer(long, pause, pause * 1000 / HZ)
-+		ctf_integer(unsigned long, period,
-+			period * 1000 / HZ)
-+		ctf_integer(long, think,
-+			current->dirty_paused_when == 0 ? 0 :
-+				(long)(jiffies - current->dirty_paused_when) * 1000/HZ)
-+		ctf_integer(unsigned int, dirtied, dirtied)
-+		ctf_integer(unsigned int, dirtied_pause,
-+			current->nr_dirtied_pause)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,15,0))
- LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
- 
- 	writeback_balance_dirty_pages,
-@@ -604,7 +729,21 @@ LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
- )
- #endif /* else (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,14,2)) */
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue,
-+
-+	TP_PROTO(struct inode *inode),
-+	TP_ARGS(inode),
-+
-+	TP_FIELDS(
-+		ctf_string(name, lttng_bdi_dev_name(inode_to_bdi(inode)))
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(u64, cgroup_ino, lttng_wb_assign_cgroup(inode_to_wb(inode)))
-+		ctf_integer(unsigned long, state, inode_state_read_once(inode))
-+		ctf_integer(unsigned long, dirtied_when, inode->dirtied_when)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0))
- LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue,
- 
- 	TP_PROTO(struct inode *inode),
-@@ -658,7 +797,30 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_congest_waited_template, writeback_wai
- 	TP_ARGS(usec_timeout, usec_delayed)
- )
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0))
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
-+
-+	TP_PROTO(struct inode *inode,
-+		 struct writeback_control *wbc,
-+		 unsigned long nr_to_write
-+	),
-+
-+	TP_ARGS(inode, wbc, nr_to_write),
-+
-+	TP_FIELDS(
-+		ctf_string(name, lttng_bdi_dev_name(inode_to_bdi(inode)))
-+		ctf_integer(u64, ino, inode->i_ino)
-+		ctf_integer(u64, cgroup_ino, lttng_wbc_assign_cgroup(wbc))
-+		ctf_integer(unsigned long, state, inode_state_read_once(inode))
-+		ctf_integer(unsigned long, dirtied_when, inode->dirtied_when)
-+		ctf_integer(unsigned long, writeback_index,
-+			inode->i_mapping->writeback_index)
-+		ctf_integer(unsigned long, wrote,
-+			nr_to_write - wbc->nr_to_write)
-+		ctf_integer(long, nr_to_write, nr_to_write)
-+	)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
- 
- 	TP_PROTO(struct inode *inode,
-@@ -704,6 +866,13 @@ LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
- )
- #endif
- 
-+LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_single_inode_template, writeback_single_inode_start,
-+	TP_PROTO(struct inode *inode,
-+		 struct writeback_control *wbc,
-+		 unsigned long nr_to_write),
-+	TP_ARGS(inode, wbc, nr_to_write)
-+)
-+
- LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_single_inode_template, writeback_single_inode,
- 	TP_PROTO(struct inode *inode,
- 		 struct writeback_control *wbc,
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
index b6001c2e29..6463bcd6cc 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
@@ -1,4 +1,4 @@
-From e7d6a99119798856810f4067c7c550cae2173cef Mon Sep 17 00:00:00 2001
+From 78f79eb607b6c0be71144d1ca70391f989846db1 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <bruce.ashfield@gmail.com>
 Date: Sat, 15 May 2021 10:26:38 -0400
 Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.15.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.15.2.bb
similarity index 63%
rename from meta/recipes-kernel/lttng/lttng-modules_2.15.1.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.15.2.bb
index c6c78c1840..e281ed2fd8 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.15.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.15.2.bb
@@ -14,16 +14,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
 
 # Use :append here so that the patch is applied also when using devupstream
 SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \
-                   file://0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch \
-                   file://0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch \
-                   file://0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch \
-                   file://0001-fix-mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints-v7.1.patch \
-                   file://0001-fix-vfs-widen-trace-event-i_ino-fields-to-u64-v7.1.patch \
-                   file://0001-fix-treewide-change-inode-i_ino-from-unsigned-long-to-u64-v7.1.patch \
-                   file://0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch \
-                   file://0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch \
                 "
-SRC_URI[sha256sum] = "4eab35edeaa84ddefa243f2f842af1482325062ee008fb511a3ff191b9aa09ac"
+SRC_URI[sha256sum] = "a8fbe5f76a89856505a4310c549952b7a47350b1115679c59fd303ac457444a8"
 
 export INSTALL_MOD_DIR = "kernel/lttng-modules"
 
-- 
2.47.3

[PATCH 24/45] opkg: upgrade 0.9.0 -> 0.10.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop backports.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-opkg.lock-in-run-instead-of-var-run.patch |  4 +-
 .../opkg/opkg/0002-config.h.in-fix-typo.patch | 27 ------
 ...003-cmake-fix-WITH_ACL-and-USE_XATTR.patch | 95 -------------------
 .../opkg/{opkg_0.9.0.bb => opkg_0.10.0.bb}    |  4 +-
 4 files changed, 3 insertions(+), 127 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch
 delete mode 100644 meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch
 rename meta/recipes-devtools/opkg/{opkg_0.9.0.bb => opkg_0.10.0.bb} (94%)

diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
index 98daf746ec..88aadbd51c 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
+++ b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
@@ -1,4 +1,4 @@
-From 82b29dcfe3033d8285890bf46e58f464d9944196 Mon Sep 17 00:00:00 2001
+From 1b1ea74d7375168eadc562d316a590e0dcae1260 Mon Sep 17 00:00:00 2001
 From: Jonathan Liu <net147@gmail.com>
 Date: Mon, 21 Sep 2015 20:23:23 +1000
 Subject: [PATCH] opkg_conf: create opkg.lock in /run instead of /var/run
@@ -17,7 +17,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
-index 3fa6ca9..b12672e 100644
+index 650b59c..f9cf981 100644
 --- a/libopkg/opkg_conf.h
 +++ b/libopkg/opkg_conf.h
 @@ -42,7 +42,7 @@ extern "C" {
diff --git a/meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch b/meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch
deleted file mode 100644
index 626bbd01b6..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5a81faadbc2397d554bc598d535fd2d44cbc8d10 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Mon, 20 Oct 2025 18:57:56 +0200
-Subject: [PATCH] config.h.in: fix typo
-
-Upstream-Status: Backport [https://git.yoctoproject.org/opkg/commit/?id=d723a90bfe6409c7ad983ed911225d4aefbfd09e]
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
----
- config.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index 4fa9842..877b8c7 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -2,7 +2,7 @@
- #cmakedefine01 WITH_XZ
- #cmakedefine01 WITH_BZIP2
- #cmakedefine01 WITH_LZ4
--#cmakedefine01 WITH_LZSTD
-+#cmakedefine01 WITH_ZSTD
- #cmakedefine01 WITH_CURL
- #cmakedefine01 WITH_SSLCURL
- #cmakedefine01 WITH_ACL
--- 
-2.43.0
-
diff --git a/meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch b/meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch
deleted file mode 100644
index a041965515..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6d2eb69bb7b8f1ada6232eba4eb9c223be386d29 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Thu, 27 Nov 2025 19:05:16 +0100
-Subject: [PATCH] cmake: fix WITH_ACL and USE_XATTR
-
-- CMakeLists.txt was using USE_ACL, but config.h.in was using WITH_ACL.
-  Use the consistent logic that optional dependencies use the prefix HAVE_,
-  and thus since use WITH_ACL consistently (build dependency libacl).
-
-- opkg_archive.c was using ifdef instead of if for both USE_ACL and USE_XATTR.
-
-- ENABLE_XATTR and ENABLE_ACL were both "no" per default in autoconf, and this default
-  value was mistakenly changed during the cmake migration. Change it back to OFF per default.
-
-Upstream-Status: Backport [https://git.yoctoproject.org/opkg/commit/?id=6d2eb69bb7b8f1ada6232eba4eb9c223be386d29]
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
-Signed-off-by: Alex Stewart <alex.stewart@emerson.com>
----
- CMakeLists.txt         | 6 ++++--
- config.h.in            | 2 +-
- libopkg/CMakeLists.txt | 2 +-
- libopkg/opkg_archive.c | 4 ++--
- 4 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2c01b1..316e343 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(PROJECT_VERSION "${PROJECT_VERSION}+git")
- set(VERSION ${PROJECT_VERSION})
- 
- option(STATIC_LIBOPKG "Statically link libopkg into opkg" OFF)
-+# Options which add optional dependencies are prefixed with "WITH_"
- # The current libopkg API is deprecated so only build it if requested
- option(WITH_LIBOPKG_API "Enable deprecated libopkg API" OFF)
- option(WITH_XZ "Enable xz compressor support" ON)
-@@ -23,8 +24,9 @@ option(WITH_CURL "Enable downloading with curl" ON)
- include(CMakeDependentOption)
- cmake_dependent_option(WITH_SSLCURL "Enable certificate authentication with curl" ON "WITH_CURL" OFF)
- option(WITH_SHA256 "Enable sha256sum check" OFF)
--option(USE_ACL "Enable ACL support" ON)
--option(USE_XATTR "Enable xattr support" ON)
-+option(WITH_ACL "Enable ACL support" OFF)
-+# Options which don't add optional dependencies are prefixed with "USE_"
-+option(USE_XATTR "Enable xattr support" OFF)
- option(USE_SOLVER_LIBSOLV "Enable libsolv solver support if true. Enable the internal solver if false." ON)
- if(USE_SOLVER_LIBSOLV)
-     set(USE_SOLVER_INTERNAL OFF CACHE BOOL "Disable internal solver")
-diff --git a/config.h.in b/config.h.in
-index 877b8c7..f2d74c5 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -6,7 +6,7 @@
- #cmakedefine01 WITH_CURL
- #cmakedefine01 WITH_SSLCURL
- #cmakedefine01 WITH_ACL
--#cmakedefine01 WITH_XATTR
-+#cmakedefine01 USE_XATTR
- #cmakedefine01 USE_SOLVER_LIBSOLV
- #cmakedefine01 USE_SOLVER_INTERNAL
- #cmakedefine01 WITH_GPGME
-diff --git a/libopkg/CMakeLists.txt b/libopkg/CMakeLists.txt
-index 628cb8c..39064c2 100644
---- a/libopkg/CMakeLists.txt
-+++ b/libopkg/CMakeLists.txt
-@@ -182,7 +182,7 @@ if(WITH_SSLCURL)
-     target_link_libraries(libopkg OpenSSL::Crypto OpenSSL::SSL)
- endif()
- 
--if(USE_ACL)
-+if(WITH_ACL)
-     pkg_check_modules(acl REQUIRED IMPORTED_TARGET libacl)
-     target_link_libraries(libopkg PkgConfig::acl)
- endif()
-diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
-index 48f80c0..fb40db3 100644
---- a/libopkg/opkg_archive.c
-+++ b/libopkg/opkg_archive.c
-@@ -914,11 +914,11 @@ struct opkg_ar *ar_open_pkg_data_archive(const char *filename)
-     ar->extract_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM |
-         ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_NO_OVERWRITE;
- 
--#ifdef USE_ACL
-+#if WITH_ACL
-     ar->extract_flags |= ARCHIVE_EXTRACT_ACL;
- #endif
- 
--#ifdef USE_XATTR
-+#if USE_XATTR
-     ar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR;
- #endif
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-devtools/opkg/opkg_0.9.0.bb b/meta/recipes-devtools/opkg/opkg_0.10.0.bb
similarity index 94%
rename from meta/recipes-devtools/opkg/opkg_0.9.0.bb
rename to meta/recipes-devtools/opkg/opkg_0.10.0.bb
index 7551f1bc49..debcd94a30 100644
--- a/meta/recipes-devtools/opkg/opkg_0.9.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.10.0.bb
@@ -15,12 +15,10 @@ PE = "1"
 SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
            file://opkg.conf \
            file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
-           file://0002-config.h.in-fix-typo.patch \
-           file://0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "440ef321862e01f83da4d02884a0cbb4d9d7b32f82faa81a6a85493f0c89d0f5"
+SRC_URI[sha256sum] = "4d099e010a5d262b34184fee4766bc60a8c7439741fb210aa11d51704afd04d1"
 
 # This needs to be before ptest inherit, otherwise all ptest files end packaged
 # in libopkg package if OPKGLIBDIR == libdir, because default
-- 
2.47.3

[PATCH 25/45] piglit: upgrade to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop patches merged upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...o-not-obtain-wayland-scanner-path-fr.patch |   4 +-
 ...h-rename-local-lerp-to-linear_interp.patch |  46 --------
 ...use-shape-in-place-of-newshape-on-nu.patch | 105 ------------------
 ...sts-use-unsigned-int-instead-of-uint.patch |  27 +++++
 ...Fix-narrowing-errors-seen-with-clang.patch |  50 ---------
 ...ake-egl_ext_surface_compression-cond.patch |   4 +-
 ...r.py-modify-_command-and-not-command.patch |   5 +-
 ...proper-WAYLAND_INCLUDE_DIRS-variable.patch |   4 +-
 ...t-shader.c-do-not-hardcode-build-pat.patch |   2 +-
 meta/recipes-graphics/piglit/piglit_git.bb    |   6 +-
 10 files changed, 37 insertions(+), 216 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch
 create mode 100644 meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch

diff --git a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch
index 6ce2348a71..46e5a6d83f 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch
@@ -1,4 +1,4 @@
-From 9ffd24add3263e24975318e693309881eadd99a2 Mon Sep 17 00:00:00 2001
+From abccc17819ad208c0df3edbc8bbcd134e45864f9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 23 Aug 2024 15:29:45 +0200
 Subject: [PATCH] CMakeLists.txt: do not obtain wayland-scanner path from
@@ -17,7 +17,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 99ae07a4a..d5ee9cc22 100644
+index 95f40ebfe..4c7da07b4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND)
diff --git a/meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch b/meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch
deleted file mode 100644
index 05f1dd687a..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ec0fc2fef0755b1595c3799ab25129174a4b2007 Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee@freedesktop.org>
-Date: Sat, 7 Feb 2026 18:39:39 -0800
-Subject: [PATCH] fbo-blit-stretch: rename local lerp to linear_interp
-
-Avoid conflict with C++20 std::lerp from <cmath>, which
-causes redefinition and ambiguous call errors with newer
-toolchains.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/piglit/-/commit/ec0fc2fef0755b1595c3799ab25129174a4b2007]
-
-Signed-off-by: Vinson Lee <vlee@freedesktop.org>
-Signed-off-by: Hemanth Kumar M D <Hemanth.KumarMD@windriver.com>
----
- tests/fbo/fbo-blit-stretch.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/fbo/fbo-blit-stretch.cpp b/tests/fbo/fbo-blit-stretch.cpp
-index a83288c0f..b0d362ecd 100644
---- a/tests/fbo/fbo-blit-stretch.cpp
-+++ b/tests/fbo/fbo-blit-stretch.cpp
-@@ -173,7 +173,7 @@ clamp(GLint &x, GLint xmin, GLint xmax)
- }
- 
- static float
--lerp(float x0, float x1, float w)
-+linear_interp(float x0, float x1, float w)
- {
- 	return x0 + (x1 - x0) * w;
- }
-@@ -181,9 +181,9 @@ lerp(float x0, float x1, float w)
- static float
- lerp2d(float xy00, float xy01, float xy10, float xy11, float wx, float wy)
- {
--	float y0 = lerp(xy00, xy01, wx);
--	float y1 = lerp(xy10, xy11, wx);
--	return lerp(y0, y1, wy);
-+	float y0 = linear_interp(xy00, xy01, wx);
-+	float y1 = linear_interp(xy10, xy11, wx);
-+	return linear_interp(y0, y1, wy);
- }
- 
- static float clearColor[4] = {
--- 
-2.49.0
-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch b/meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch
deleted file mode 100644
index acf2671262..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From ad6ee4d7c4d3b882ef6196832ed2bbc78b7cb10a Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Wed, 11 Feb 2026 03:42:24 +0000
-Subject: [PATCH] generated_tests: use 'shape' in place of 'newshape' on
- numpy>=2.1
-
-The 'newshape' parameter was deprecated upstream but kept for backwards
-compatibility reasons. It was finally removed as of numpy 2.4.0, so
-transition to using 'shape' in its place when available.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/piglit/-/commit/c1dd58ff61fe6b713af795e2680c16371c1cb98c]
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- generated_tests/builtin_function.py      | 17 +++++++++++++++--
- generated_tests/builtin_function_fp64.py | 17 +++++++++++++++--
- 2 files changed, 30 insertions(+), 4 deletions(-)
-
-diff --git a/generated_tests/builtin_function.py b/generated_tests/builtin_function.py
-index eb7e078..f87236f 100644
---- a/generated_tests/builtin_function.py
-+++ b/generated_tests/builtin_function.py
-@@ -58,6 +58,11 @@ import numpy as np
- if np.lib.NumpyVersion(np.__version__) >= '2.0.0b1':
-     np.set_printoptions(legacy = "1.25")
- 
-+if np.lib.NumpyVersion(np.__version__) >= '2.1.0':
-+    np_reshape_shape = 'shape'
-+else:
-+    np_reshape_shape = 'newshape'
-+
- # Floating point types used by Python and numpy
- FLOATING_TYPES = (float, np.float64, np.float32)
- 
-@@ -293,7 +298,11 @@ def column_major_values(value):
-     """Given a native numpy value, return a list of the scalar values
-     comprising it, in column-major order."""
-     if isinstance(value, np.ndarray):
--        return list(np.reshape(value, newshape=-1, order='F'))
-+        reshape_args = {
-+            np_reshape_shape: -1,
-+            'order': 'F',
-+        }
-+        return list(np.reshape(value, **reshape_args))
-     else:
-         return [value]
- 
-@@ -301,7 +310,11 @@ def column_major_values(value):
- def glsl_constant(value):
-     """Given a native numpy value, return GLSL code that constructs
-     it."""
--    column_major = np.reshape(np.array(value), newshape=-1, order='F')
-+    reshape_args = {
-+        np_reshape_shape: -1,
-+        'order': 'F',
-+    }
-+    column_major = np.reshape(np.array(value), **reshape_args)
-     if column_major.dtype == bool:
-         values = ['true' if x else 'false' for x in column_major]
-     elif column_major.dtype == np.int64:
-diff --git a/generated_tests/builtin_function_fp64.py b/generated_tests/builtin_function_fp64.py
-index 84d939c..06fe987 100644
---- a/generated_tests/builtin_function_fp64.py
-+++ b/generated_tests/builtin_function_fp64.py
-@@ -57,6 +57,11 @@ import numpy as np
- if np.lib.NumpyVersion(np.__version__) >= '2.0.0b1':
-     np.set_printoptions(legacy = "1.25")
- 
-+if np.lib.NumpyVersion(np.__version__) >= '2.1.0':
-+    np_reshape_shape = 'shape'
-+else:
-+    np_reshape_shape = 'newshape'
-+
- # Floating point types used by Python and numpy
- DOUBLE_TYPES = (float, np.float64, np.float32)
- 
-@@ -254,7 +259,11 @@ def column_major_values(value):
-     """Given a native numpy value, return a list of the scalar values
-     comprising it, in column-major order."""
-     if isinstance(value, np.ndarray):
--        return list(np.reshape(value, newshape=-1, order='F'))
-+        reshape_args = {
-+            np_reshape_shape: -1,
-+            'order': 'F',
-+        }
-+        return list(np.reshape(value, **reshape_args))
-     else:
-         return [value]
- 
-@@ -262,7 +271,11 @@ def column_major_values(value):
- def glsl_constant(value):
-     """Given a native numpy value, return GLSL code that constructs
-     it."""
--    column_major = np.reshape(np.array(value), newshape=-1, order='F')
-+    reshape_args = {
-+        np_reshape_shape: -1,
-+        'order': 'F',
-+    }
-+    column_major = np.reshape(np.array(value), **reshape_args)
-     if column_major.dtype == bool:
-         values = ['true' if x else 'false' for x in column_major]
-     else:
--- 
-2.43.0
-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch b/meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch
new file mode 100644
index 0000000000..2c01fe7029
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch
@@ -0,0 +1,27 @@
+From 8b98674fedc0ac31e768ccd16165bcb585e413e2 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 2 Jul 2026 13:56:17 +0200
+Subject: [PATCH] pixel-local-tests: use unsigned int instead of uint
+
+uint is not a valid integer type in C, and this fails
+to compile under musl libc library.
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1170]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c b/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c
+index 4776193f2..1ac669d11 100644
+--- a/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c
++++ b/tests/spec/ext_shader_pixel_local_storage/pixel-local-tests.c
+@@ -851,7 +851,7 @@ make_test_main_str(char *dst, struct pls_format_data *format_data,
+ 		case GL_RGBA8UI:
+ 		case GL_RG16UI:
+ 		case GL_R32UI: {
+-			uint expected[4];
++			unsigned int expected[4];
+ 			for (int comp = 0; comp < 4; comp++) {
+ 				if (comp < format_data[member].num_components)
+ 					expected[comp] = format_data[member].u[comp];
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
deleted file mode 100644
index 9751b20673..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0ba2f908f2a2a897e8e06e34f99893d11ee4734c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 3 May 2023 21:59:43 -0700
-Subject: [PATCH] tests: Fix narrowing errors seen with clang
-
-Fixes
-piglit-test-pattern.cpp:656:26: error: type 'float' cannot be narrowed to 'int' in initiali
-zer list [-Wc++11-narrowing]
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/807]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../spec/ext_framebuffer_multisample/draw-buffers-common.cpp  | 4 ++--
- tests/util/piglit-test-pattern.cpp                            | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp b/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
-index 48e1ad4a5..b36830c45 100644
---- a/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
-+++ b/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
-@@ -353,8 +353,8 @@ draw_pattern(bool sample_alpha_to_coverage,
- 		float vertices[4][2] = {
- 		{ 0.0f, 0.0f + i * (pattern_height / num_rects) },
- 		{ 0.0f, (i + 1.0f) * (pattern_height / num_rects) },
--		{ pattern_width, (i + 1.0f) * (pattern_height / num_rects) },
--		{ pattern_width, 0.0f + i * (pattern_height / num_rects) } };
-+		{ static_cast<float>(pattern_width), (i + 1.0f) * (pattern_height / num_rects) },
-+		{ static_cast<float>(pattern_width), 0.0f + i * (pattern_height / num_rects) } };
- 
- 		glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE,
- 				      sizeof(vertices[0]),
-diff --git a/tests/util/piglit-test-pattern.cpp b/tests/util/piglit-test-pattern.cpp
-index 43d451d6a..52ee94457 100644
---- a/tests/util/piglit-test-pattern.cpp
-+++ b/tests/util/piglit-test-pattern.cpp
-@@ -653,12 +653,12 @@ ColorGradientSunburst::draw_with_scale_and_offset(const float (*proj)[4],
- {
- 	switch (out_type) {
- 	case GL_INT: {
--		int clear_color[4] = { offset, offset, offset, offset };
-+		int clear_color[4] = { static_cast<int>(offset), static_cast<int>(offset), static_cast<int>(offset), static_cast<int>(offset) };
- 		glClearBufferiv(GL_COLOR, 0, clear_color);
- 		break;
- 	}
- 	case GL_UNSIGNED_INT: {
--		unsigned clear_color[4] = { offset, offset, offset, offset };
-+		unsigned clear_color[4] = { static_cast<unsigned>(offset), static_cast<unsigned>(offset), static_cast<unsigned>(offset), static_cast<unsigned>(offset) };
- 		glClearBufferuiv(GL_COLOR, 0, clear_color);
- 		break;
- 	}
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch
index c6c072c7e0..c71bf4c8bc 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch
@@ -1,4 +1,4 @@
-From d6ed4c477f22309c09accd4fee68486d7714f205 Mon Sep 17 00:00:00 2001
+From 3e7ec165c718234e1afcdf730bdf20942976e25c Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 22 Nov 2024 22:52:31 +0100
 Subject: [PATCH] tests/egl/spec: make egl_ext_surface_compression conditional
@@ -39,7 +39,7 @@ index d9540bcfd..01a70164f 100644
  
  # vim: ft=cmake:
 diff --git a/tests/egl/spec/egl_ext_surface_compression/create_surface.c b/tests/egl/spec/egl_ext_surface_compression/create_surface.c
-index e3d55d433..35f13fd00 100644
+index 71b043b54..09e87dee4 100644
 --- a/tests/egl/spec/egl_ext_surface_compression/create_surface.c
 +++ b/tests/egl/spec/egl_ext_surface_compression/create_surface.c
 @@ -25,7 +25,6 @@
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch
index f8600556e5..035e7a4d5a 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch
@@ -1,4 +1,4 @@
-From 846efe923932d66810305b228fa09f83a172296d Mon Sep 17 00:00:00 2001
+From 14e56a6336f36d1112964ce1ff0900ea4b37b483 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Thu, 22 May 2025 17:34:15 +0200
 Subject: [PATCH] tests/no_error.py: modify _command and not command
@@ -27,6 +27,3 @@ index 4ecaa9a01..c64eec0a1 100644
          profile.test_list['{} khr_no_error'.format(name)] = test
 -        test.command += ['-khr_no_error']
 +        test._command += ['-khr_no_error']
--- 
-2.39.5
-
diff --git a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
index 6cb561c3f2..329fd75975 100644
--- a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
+++ b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
@@ -1,4 +1,4 @@
-From deb0c15890fb9d0f4fc7074dde2a51c89cb5bf6d Mon Sep 17 00:00:00 2001
+From 4444dd748b9324508e3168f64cf0b5adc31b5ebd Mon Sep 17 00:00:00 2001
 From: Pascal Bach <pascal.bach@siemens.com>
 Date: Thu, 4 Oct 2018 14:43:17 +0200
 Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
@@ -15,7 +15,7 @@ Upstream-Status: Submitted [piglit@lists.freedesktop.org]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
-index 1714ab41f..3b67aa7da 100644
+index f9bfec555..07b821375 100644
 --- a/tests/util/CMakeLists.txt
 +++ b/tests/util/CMakeLists.txt
 @@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
diff --git a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
index 7706d88086..9c05e639b3 100644
--- a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
+++ b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
@@ -1,4 +1,4 @@
-From 66d1d86ff8be33df265d0dda717be385fe8637cd Mon Sep 17 00:00:00 2001
+From f9bfdb8d32c2113c39c3be1bd6fd0934f693ab03 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 10 Nov 2020 17:13:50 +0000
 Subject: [PATCH] tests/util/piglit-shader.c: do not hardcode build path into
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 0dd9c58714..a020d67bbf 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -9,16 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \
            file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
            file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
-           file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \
            file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \
            file://0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch \
            file://0001-tests-no_error.py-modify-_command-and-not-command.patch \
-           file://0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch \
-           file://0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch \
+           file://0001-pixel-local-tests-use-unsigned-int-instead-of-uint.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "a0a27e528f643dfeb785350a1213bfff09681950"
+SRCREV = "56f237be32ed66820eb05ea3cb04cb8b957ccd8d"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr"
 
-- 
2.47.3

[PATCH 26/45] python3-click: upgrade 8.4.1 -> 8.4.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...7494c991c9197902fdf4995e11b2da3e9762.patch | 173 ------------------
 .../python/python3-click/pytest-fix.patch     |  19 +-
 ...-click_8.4.1.bb => python3-click_8.4.2.bb} |   3 +-
 3 files changed, 14 insertions(+), 181 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-click/ffcc7494c991c9197902fdf4995e11b2da3e9762.patch
 rename meta/recipes-devtools/python/{python3-click_8.4.1.bb => python3-click_8.4.2.bb} (86%)

diff --git a/meta/recipes-devtools/python/python3-click/ffcc7494c991c9197902fdf4995e11b2da3e9762.patch b/meta/recipes-devtools/python/python3-click/ffcc7494c991c9197902fdf4995e11b2da3e9762.patch
deleted file mode 100644
index e16f84ec9a..0000000000
--- a/meta/recipes-devtools/python/python3-click/ffcc7494c991c9197902fdf4995e11b2da3e9762.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-"Fix pager test flackiness and add stress tests for echo_via_pager"
-
-From 7eb57cff7cd292fbd526eaf861c8f945ddeb07a3 Mon Sep 17 00:00:00 2001
-From: Kevin Deldycke <kevin@deldycke.com>
-Date: Fri, 22 May 2026 11:13:12 +0200
-Subject: [PATCH] Fix pager test race by raising before yield
-
-Upstream-Status: Backport [https://github.com/pallets/click/commit/ffcc7494c991c9197902fdf4995e11b2da3e9762]
-
-Refs: #3470 #2899
----
- pyproject.toml                 |  3 +-
- src/click/_compat.py           |  1 -
- tests/test_stream_lifecycle.py |  4 +-
- tests/test_utils.py            | 79 +++++++++++++++++++++++++++++++---
- 4 files changed, 78 insertions(+), 9 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index e39ef21055..ed91e5d741 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -185,12 +185,11 @@ commands = [[
- ]]
- 
- [tool.tox.env.stress]
--description = "stress tests for stream lifecycle race conditions"
-+description = "high-iteration stress tests for race conditions"
- commands = [[
-     "pytest", "-v", "--tb=short", "-x", "-m", "stress",
-     "--basetemp={env_tmp_dir}",
-     "--override-ini=addopts=",
--    "tests/test_stream_lifecycle.py",
-     {replace = "posargs", default = [], extend = true},
- ]]
- 
-diff --git a/src/click/_compat.py b/src/click/_compat.py
-index 36c0e53975..134c4f3893 100644
---- a/src/click/_compat.py
-+++ b/src/click/_compat.py
-@@ -12,7 +12,6 @@
- 
- CYGWIN = sys.platform.startswith("cygwin")
- WIN = sys.platform.startswith("win")
--MAC = sys.platform == "darwin"
- auto_wrap_for_ansi: t.Callable[[t.TextIO], t.TextIO] | None = None
- _ansi_re = re.compile(r"\033\[[;?0-9]*[a-zA-Z]")
- 
-diff --git a/tests/test_stream_lifecycle.py b/tests/test_stream_lifecycle.py
-index 42e26acc34..9f4aa20868 100644
---- a/tests/test_stream_lifecycle.py
-+++ b/tests/test_stream_lifecycle.py
-@@ -484,7 +484,9 @@ def cli():
- # Category 6: Stress tests - high-iteration reproducers for race conditions
- #
- # These are marked with ``pytest.mark.stress`` so they can be included or
--# excluded independently. The CI workflow runs them in a separate job.
-+# excluded independently. The ``tox -e stress`` env collects every
-+# ``pytest.mark.stress`` test across the suite (not just this file), so
-+# stress regressions for other components live alongside their unit tests.
- # ---------------------------------------------------------------------------
- 
- 
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 139cd7324f..1aebf3cc5a 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -16,7 +16,6 @@
- 
- import click._termui_impl
- import click.utils
--from click._compat import MAC
- from click._compat import WIN
- from click._utils import UNSET
- 
-@@ -286,6 +285,11 @@ def _test_gen_func():
- 
- 
- def _test_gen_func_fails():
-+    raise RuntimeError("This is a test.")
-+    yield  # unreachable, keeps this a generator function
-+
-+
-+def _test_gen_func_yields_then_fails():
-     yield "test"
-     raise RuntimeError("This is a test.")
- 
-@@ -315,10 +319,6 @@ def _test_simulate_keyboard_interrupt(file=None):
- 
- 
- @pytest.mark.skipif(WIN, reason="Different behavior on windows.")
--@pytest.mark.skipif(
--    MAC and sys.version_info >= (3, 13) and not sys._is_gil_enabled(),
--    reason="Generator exception tests are flaky in Python 3.14t on macOS.",
--)
- @pytest.mark.parametrize(
-     "pager_cmd", ["cat", "cat ", " cat ", "less", " less", " less "]
- )
-@@ -456,6 +456,75 @@ def test_echo_via_pager(monkeypatch, capfd, pager_cmd, test, tmp_path):
-     )
- 
- 
-+@pytest.mark.skipif(WIN, reason="Different behavior on windows.")
-+def test_echo_via_pager_yields_before_exception(monkeypatch, tmp_path):
-+    """A generator that yields then raises: click writes the partial output to
-+    the pager stream before propagating the exception.
-+
-+    The pager file content is intentionally NOT asserted: pipe-drain timing
-+    between click and the pager subprocess is outside click's control
-+    (#2899, #3470). Spying on ``MaybeStripAnsi.write`` records what click sent
-+    to the pager, which is deterministic regardless of scheduling.
-+    """
-+    monkeypatch.setitem(os.environ, "PAGER", "cat")
-+    monkeypatch.setattr(click._termui_impl, "isatty", lambda x: True)
-+
-+    writes: list[str] = []
-+    real_write = click._termui_impl.MaybeStripAnsi.write
-+
-+    def spy(self, text):
-+        writes.append(text)
-+        return real_write(self, text)
-+
-+    monkeypatch.setattr(click._termui_impl.MaybeStripAnsi, "write", spy)
-+
-+    pager_out_tmp = tmp_path / "pager_out.txt"
-+    with (
-+        pager_out_tmp.open("w") as f,
-+        patch.object(subprocess, "Popen", partial(subprocess.Popen, stdout=f)),
-+        pytest.raises(RuntimeError, match="This is a test."),
-+    ):
-+        click.echo_via_pager(_test_gen_func_yields_then_fails())
-+
-+    assert "".join(writes) == "test", (
-+        f"click should have written the yielded chunk before exception, got {writes!r}"
-+    )
-+
-+
-+@pytest.mark.stress
-+@pytest.mark.skipif(WIN, reason="Different behavior on windows.")
-+@pytest.mark.parametrize("_", range(1000))
-+def test_stress_echo_via_pager_exception_cleanup(_, monkeypatch, tmp_path):
-+    """Repeated exceptions during ``echo_via_pager`` must not leak subprocesses.
-+
-+    Regression coverage for the cleanup path in ``_pipepager``'s exception
-+    handler (issue #2899, PR #3470). Each iteration spawns a real pager
-+    subprocess, raises before any data is written and check there is no leak.
-+    """
-+    monkeypatch.setitem(os.environ, "PAGER", "cat")
-+    monkeypatch.setattr(click._termui_impl, "isatty", lambda x: True)
-+
-+    spawned: list[subprocess.Popen] = []
-+    real_popen = subprocess.Popen
-+
-+    def tracking_popen(*args, **kwargs):
-+        p = real_popen(*args, **kwargs)
-+        spawned.append(p)
-+        return p
-+
-+    pager_out_tmp = tmp_path / "pager_out.txt"
-+    with (
-+        pager_out_tmp.open("w") as f,
-+        patch.object(subprocess, "Popen", partial(tracking_popen, stdout=f)),
-+        pytest.raises(RuntimeError),
-+    ):
-+        click.echo_via_pager(_test_gen_func_fails())
-+
-+    assert spawned, "pager subprocess was never started"
-+    for p in spawned:
-+        assert p.returncode is not None, "pager subprocess not reaped"
-+
-+
- def test_echo_color_flag(monkeypatch, capfd):
-     isatty = True
-     monkeypatch.setattr(click._compat, "isatty", lambda x: isatty)
diff --git a/meta/recipes-devtools/python/python3-click/pytest-fix.patch b/meta/recipes-devtools/python/python3-click/pytest-fix.patch
index 662ad8aae9..abfa07120a 100644
--- a/meta/recipes-devtools/python/python3-click/pytest-fix.patch
+++ b/meta/recipes-devtools/python/python3-click/pytest-fix.patch
@@ -1,4 +1,8 @@
-Fix an error with newer versions of pytest (9.1.0) by converting the generator into a tuple:
+From 1cdbe9829973a30037075d613b5a1d5a42e260d5 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Mon, 15 Jun 2026 11:37:28 +0100
+Subject: [PATCH] Fix an error with newer versions of pytest (9.1.0) by
+ converting the generator into a tuple:
 
 E   pytest.PytestRemovedIn10Warning: Passing a non-Collection iterable to parametrize is deprecated.
 E   Test: tests/test_basic.py::test_boolean_conversion, argvalues type: chain
@@ -9,12 +13,15 @@ ERROR: tests/test_basic.py:tests/test_basic.py
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 
 Upstream-Status: Submitted [https://github.com/pallets/click/pull/3597]
+---
+ tests/test_basic.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: click-8.3.3/tests/test_basic.py
-===================================================================
---- click-8.3.3.orig/tests/test_basic.py
-+++ click-8.3.3/tests/test_basic.py
-@@ -258,10 +258,10 @@ def test_boolean_flag(runner, default, a
+diff --git a/tests/test_basic.py b/tests/test_basic.py
+index 34d22e7..8076dd8 100644
+--- a/tests/test_basic.py
++++ b/tests/test_basic.py
+@@ -258,10 +258,10 @@ def test_boolean_flag(runner, default, args, expect):
  
  @pytest.mark.parametrize(
      ("value", "expect"),
diff --git a/meta/recipes-devtools/python/python3-click_8.4.1.bb b/meta/recipes-devtools/python/python3-click_8.4.2.bb
similarity index 86%
rename from meta/recipes-devtools/python/python3-click_8.4.1.bb
rename to meta/recipes-devtools/python/python3-click_8.4.2.bb
index 53c75c333c..b13bdc9285 100644
--- a/meta/recipes-devtools/python/python3-click_8.4.1.bb
+++ b/meta/recipes-devtools/python/python3-click_8.4.2.bb
@@ -9,8 +9,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fa98232fd645608937a0fdc82e999b8"
 
 SRC_URI += "file://pytest-fix.patch"
-SRC_URI += "file://ffcc7494c991c9197902fdf4995e11b2da3e9762.patch"
-SRC_URI[sha256sum] = "918b5633eddf6b41c32d4f454bf0de810065c74e3f7dbf8ee5452f8be88d3e96"
+SRC_URI[sha256sum] = "9a6cea6e60b17ebe0a44c5cc636d94f09bd66142c1cd7d8b4cd731c4917a15f6"
 
 inherit pypi python_flit_core ptest-python-pytest
 
-- 
2.47.3

[PATCH 27/45] python3-hypothesis: upgrade 6.155.2 -> 6.155.7

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...hon3-hypothesis_6.155.2.bb => python3-hypothesis_6.155.7.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.155.2.bb => python3-hypothesis_6.155.7.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.155.2.bb b/meta/recipes-devtools/python/python3-hypothesis_6.155.7.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.155.2.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.155.7.bb
index c828671ac8..70ae7877a1 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.155.2.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.155.7.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "ae36880287c9c5defe9f199d3d2b67d9947a4da2a46e6c57373cbdf2345b20e1"
+SRC_URI[sha256sum] = "d8d6091753d0669db3c90c5e5b346cb37c72f3dd9378c8413acb1fd5da63f7ea"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
-- 
2.47.3

[PATCH 28/45] python3-pdm: upgrade 2.27.0 -> 2.28.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../python/{python3-pdm_2.27.0.bb => python3-pdm_2.28.0.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pdm_2.27.0.bb => python3-pdm_2.28.0.bb} (80%)

diff --git a/meta/recipes-devtools/python/python3-pdm_2.27.0.bb b/meta/recipes-devtools/python/python3-pdm_2.28.0.bb
similarity index 80%
rename from meta/recipes-devtools/python/python3-pdm_2.27.0.bb
rename to meta/recipes-devtools/python/python3-pdm_2.28.0.bb
index f378e1edda..23d2f9e521 100644
--- a/meta/recipes-devtools/python/python3-pdm_2.27.0.bb
+++ b/meta/recipes-devtools/python/python3-pdm_2.28.0.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2"
 
-SRC_URI[sha256sum] = "dbfbc484065d0150fa5b29484ead908354313d8699cf74c099d4531826bd04de"
+SRC_URI[sha256sum] = "ca7d21548955086985070d2fe4334a55e59093a466b25eebc6bb0769a0539e89"
 
 inherit pypi python_pdm
 
-- 
2.47.3

[PATCH 29/45] python3-pytest: upgrade 9.1.0 -> 9.1.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../python/{python3-pytest_9.1.0.bb => python3-pytest_9.1.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pytest_9.1.0.bb => python3-pytest_9.1.1.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-pytest_9.1.0.bb b/meta/recipes-devtools/python/python3-pytest_9.1.1.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-pytest_9.1.0.bb
rename to meta/recipes-devtools/python/python3-pytest_9.1.1.bb
index b61e86cd00..8c97596ccc 100644
--- a/meta/recipes-devtools/python/python3-pytest_9.1.0.bb
+++ b/meta/recipes-devtools/python/python3-pytest_9.1.1.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c"
 
-SRC_URI[sha256sum] = "41dd9148c08072446394cefd3d79701701335a9f4cae69ba92e39f6c7f5c061c"
+SRC_URI[sha256sum] = "1088fbde8f2b49d95a549a195707afa7a76a3ce9bcadc26b6d71f0ffda5fe313"
 
 DEPENDS += "python3-setuptools-scm-native"
 
-- 
2.47.3

[PATCH 30/45] python3-setuptools-rust: upgrade 1.12.1 -> 1.13.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Add a patch to avoid build failures due to use of custom rust targets.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...rustc_info.py-do-not-add-unstable-op.patch | 44 +++++++++++++++++++
 ...1.bb => python3-setuptools-rust_1.13.0.bb} |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python3-setuptools-rust/0001-setuptools_rust-rustc_info.py-do-not-add-unstable-op.patch
 rename meta/recipes-devtools/python/{python3-setuptools-rust_1.12.1.bb => python3-setuptools-rust_1.13.0.bb} (83%)

diff --git a/meta/recipes-devtools/python/python3-setuptools-rust/0001-setuptools_rust-rustc_info.py-do-not-add-unstable-op.patch b/meta/recipes-devtools/python/python3-setuptools-rust/0001-setuptools_rust-rustc_info.py-do-not-add-unstable-op.patch
new file mode 100644
index 0000000000..313e7454c1
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-setuptools-rust/0001-setuptools_rust-rustc_info.py-do-not-add-unstable-op.patch
@@ -0,0 +1,44 @@
+From 8e0c0ae45a8e4274482d39ee87775ca6d8de9ccb Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Tue, 30 Jun 2026 21:36:12 +0200
+Subject: [PATCH] setuptools_rust/rustc_info.py: do not add 'unstable-options'
+ to rustc invocation
+
+This avoids the error:
+| error: the option `Z` is only accepted on the nightly compiler
+| 
+| help: consider switching to a nightly toolchain: `rustup default nightly`
+| 
+| note: selecting a toolchain with `+toolchain` arguments require a rustup proxy; see <https://rust-lang.github.io/rustup/concepts/index.html>
+| 
+| note: for more information about Rust's stability policy, see <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html#unstable-features>
+| 
+| error: 1 nightly option were parsed
+
+Please see https://github.com/rust-lang/rust/issues/155963
+for report to upstream about why we need custom targets and why
+requiring unstable-options gets in the way, badly.
+
+Rust is meanwhile patched to not require it:
+meta/recipes-devtools/rust/files/0002-Fix-rust-build-failure-with-unstable-options.patch
+
+Upstream-Status: Inappropriate [the issue is in rustc; see above]
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ setuptools_rust/rustc_info.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setuptools_rust/rustc_info.py b/setuptools_rust/rustc_info.py
+index ad37249..f470e04 100644
+--- a/setuptools_rust/rustc_info.py
++++ b/setuptools_rust/rustc_info.py
+@@ -68,8 +68,6 @@ def get_rustc_cfgs(target_triple: Optional[str], env: Env) -> RustCfgs:
+ def get_rust_target_info(target_triple: Optional[str], env: Env) -> List[str]:
+     cmd = ["rustc", "--print", "cfg"]
+     if target_triple:
+-        if _is_custom_target(target_triple):
+-            cmd.extend(["-Z", "unstable-options"])
+         cmd.extend(["--target", target_triple.split(".")[0]])
+     output = check_subprocess_output(cmd, env=env, text=True)
+     return output.splitlines()
diff --git a/meta/recipes-devtools/python/python3-setuptools-rust_1.12.1.bb b/meta/recipes-devtools/python/python3-setuptools-rust_1.13.0.bb
similarity index 83%
rename from meta/recipes-devtools/python/python3-setuptools-rust_1.12.1.bb
rename to meta/recipes-devtools/python/python3-setuptools-rust_1.13.0.bb
index a1135794ba..884d6a6771 100644
--- a/meta/recipes-devtools/python/python3-setuptools-rust_1.12.1.bb
+++ b/meta/recipes-devtools/python/python3-setuptools-rust_1.13.0.bb
@@ -9,7 +9,8 @@ BUGTRACKER = "https://github.com/PyO3/setuptools-rust/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5"
 
-SRC_URI[sha256sum] = "85ae70989d96c9cfeb5ef79cf3bac2d5200bc5564f720a06edceedbdf6664640"
+SRC_URI += "file://0001-setuptools_rust-rustc_info.py-do-not-add-unstable-op.patch"
+SRC_URI[sha256sum] = "f2afcf4baeee689910ce49cfa8aad4e08cce72f417449bcc32891b8664fdc726"
 
 PYPI_PACKAGE = "setuptools_rust"
 
-- 
2.47.3

[PATCH 31/45] python3-setuptools-scm: upgrade 10.0.5 -> 10.2.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...etuptools-scm_10.0.5.bb => python3-setuptools-scm_10.2.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-setuptools-scm_10.0.5.bb => python3-setuptools-scm_10.2.0.bb} (89%)

diff --git a/meta/recipes-devtools/python/python3-setuptools-scm_10.0.5.bb b/meta/recipes-devtools/python/python3-setuptools-scm_10.2.0.bb
similarity index 89%
rename from meta/recipes-devtools/python/python3-setuptools-scm_10.0.5.bb
rename to meta/recipes-devtools/python/python3-setuptools-scm_10.2.0.bb
index 3e86c4fd2c..d3ff181ad6 100644
--- a/meta/recipes-devtools/python/python3-setuptools-scm_10.0.5.bb
+++ b/meta/recipes-devtools/python/python3-setuptools-scm_10.2.0.bb
@@ -6,7 +6,7 @@ argument or in a SCM managed file."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2"
 
-SRC_URI[sha256sum] = "bbba8fe754516cdefd017f4456721775e6ef9662bd7887fb52ae26813d4838c3"
+SRC_URI[sha256sum] = "ec8ea1738b92e42146a46e29a0e9de9ad462744c63cf9778677b95dfd605adde"
 
 PYPI_PACKAGE = "setuptools_scm"
 
-- 
2.47.3

[PATCH 32/45] python3-vcs-versioning: upgrade 1.1.1 -> 2.2.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-vcs-versioning_1.1.1.bb => python3-vcs-versioning_2.2.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-vcs-versioning_1.1.1.bb => python3-vcs-versioning_2.2.2.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-vcs-versioning_1.1.1.bb b/meta/recipes-devtools/python/python3-vcs-versioning_2.2.2.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-vcs-versioning_1.1.1.bb
rename to meta/recipes-devtools/python/python3-vcs-versioning_2.2.2.bb
index 4d2f5007b4..300284e4c0 100644
--- a/meta/recipes-devtools/python/python3-vcs-versioning_1.1.1.bb
+++ b/meta/recipes-devtools/python/python3-vcs-versioning_2.2.2.bb
@@ -5,7 +5,7 @@ library that can be used independently of setuptools."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c9b06ad2ebd7e2e82d34b3caf353e7d5"
 
-SRC_URI[sha256sum] = "fabd75a3cab7dd8ac02fe24a3a9ba936bf258667b5a62ed468c9a1da0f5775bc"
+SRC_URI[sha256sum] = "4ac4ded78720cdb4d0291ae58ace87e1e9201912e1023f3029c6cce5c9152cfb"
 
 SRC_URI += "\
     file://run-ptest \
-- 
2.47.3

[PATCH 33/45] python3-wcwidth: upgrade 0.8.1 -> 0.8.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{python3-wcwidth_0.8.1.bb => python3-wcwidth_0.8.2.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-wcwidth_0.8.1.bb => python3-wcwidth_0.8.2.bb} (84%)

diff --git a/meta/recipes-devtools/python/python3-wcwidth_0.8.1.bb b/meta/recipes-devtools/python/python3-wcwidth_0.8.2.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-wcwidth_0.8.1.bb
rename to meta/recipes-devtools/python/python3-wcwidth_0.8.2.bb
index 9b306225d9..d5867ef9b8 100644
--- a/meta/recipes-devtools/python/python3-wcwidth_0.8.1.bb
+++ b/meta/recipes-devtools/python/python3-wcwidth_0.8.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/jquast/wcwidth"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b15979c39a2543892fca8cd86b4b52cb"
 
-SRC_URI[sha256sum] = "faf5b4a5366a72dc49cad48cdf21f52bdf63bdda995178e483ba247ff79089b9"
+SRC_URI[sha256sum] = "91fbef97204b96a3d4d421609b80340b760cf33e26da123ff243d76b1fda8dda"
 
 inherit pypi python_hatchling ptest-python-pytest
 
-- 
2.47.3

[PATCH 34/45] qemu: upgrade 11.0.1 -> 11.0.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../qemu/{qemu-native_11.0.1.bb => qemu-native_11.0.2.bb}   | 0
 ...system-native_11.0.1.bb => qemu-system-native_11.0.2.bb} | 0
 meta/recipes-devtools/qemu/qemu.inc                         | 2 +-
 ...mu-Add-addition-environment-space-to-boot-loader-q.patch | 2 +-
 ...-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch | 6 +++---
 .../qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch      | 6 +++---
 .../qemu/0004-qemu-Do-not-include-file-if-not-exists.patch  | 4 ++--
 ...mu-Add-some-user-space-mmap-tweaks-to-address-musl.patch | 2 +-
 .../qemu/qemu/0006-qemu-Determinism-fixes.patch             | 2 +-
 ...sts-meson.build-use-relative-path-to-refer-to-file.patch | 6 +++---
 ...fine-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch | 2 +-
 .../0010-configure-lookup-meson-exutable-from-PATH.patch    | 2 +-
 ...mu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch | 2 +-
 ...012-meson-fix-close_range-detection-on-older-glibc.patch | 2 +-
 ...-include-standard-headers-for-vhost-worker-structs.patch | 2 +-
 .../qemu/{qemu_11.0.1.bb => qemu_11.0.2.bb}                 | 0
 16 files changed, 20 insertions(+), 20 deletions(-)
 rename meta/recipes-devtools/qemu/{qemu-native_11.0.1.bb => qemu-native_11.0.2.bb} (100%)
 rename meta/recipes-devtools/qemu/{qemu-system-native_11.0.1.bb => qemu-system-native_11.0.2.bb} (100%)
 rename meta/recipes-devtools/qemu/{qemu_11.0.1.bb => qemu_11.0.2.bb} (100%)

diff --git a/meta/recipes-devtools/qemu/qemu-native_11.0.1.bb b/meta/recipes-devtools/qemu/qemu-native_11.0.2.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_11.0.1.bb
rename to meta/recipes-devtools/qemu/qemu-native_11.0.2.bb
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_11.0.1.bb b/meta/recipes-devtools/qemu/qemu-system-native_11.0.2.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_11.0.1.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_11.0.2.bb
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 114a3d22a7..0fb77250f8 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -42,7 +42,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
 UPSTREAM_CHECK_URI = "https://www.qemu.org"
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI[sha256sum] = "0d235f5820278d914a3155ec27af8e4258d697ea892895570807d69c0cb8cd64"
+SRC_URI[sha256sum] = "3745f6ea88e2e87fe0dc838b2b1d4e0a770bf48e01a1d5a186842a1fff76ccf5"
 
 CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default."
 
diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
index 999d34aa75..94f23558bc 100644
--- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
+++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
@@ -1,4 +1,4 @@
-From ae20f7ba1494b3593761a96b2300a9df9c5f6040 Mon Sep 17 00:00:00 2001
+From 4c030fef6b75bfc9aed21099b12648f13f7626a6 Mon Sep 17 00:00:00 2001
 From: Jason Wessel <jason.wessel@windriver.com>
 Date: Fri, 28 Mar 2014 17:42:43 +0800
 Subject: [PATCH] qemu: Add addition environment space to boot loader
diff --git a/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch b/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch
index 6b84254ac1..a49710c86d 100644
--- a/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch
+++ b/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch
@@ -1,4 +1,4 @@
-From ba4efe836c488d00e0f44929ee45feb3b1c1e014 Mon Sep 17 00:00:00 2001
+From 0a029de8c4c31507cae542b5413491283569467c Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Wed, 10 Jun 2026 15:00:26 +0200
 Subject: [PATCH] ui/sdl2.c: force-disable SDL_HINT_VIDEO_X11_FORCE_EGL,
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ui/sdl2.c b/ui/sdl2.c
-index 987ad334b..b4c8a50de 100644
+index eccc5b0e9..ab91eaf25 100644
 --- a/ui/sdl2.c
 +++ b/ui/sdl2.c
-@@ -871,7 +871,7 @@ static void sdl2_set_hint_x11_force_egl(void)
+@@ -874,7 +874,7 @@ static void sdl2_set_hint_x11_force_egl(void)
           * It's always safe to set the hint even if X11 is not used by SDL.
           * SDL will work regardless of the hint.
           */
diff --git a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
index 5e74abbc8d..fe9ca05614 100644
--- a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
+++ b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
@@ -1,4 +1,4 @@
-From 6a739f00ffa39aaf42545a7d27aa4d696b5b1cf9 Mon Sep 17 00:00:00 2001
+From eb7f727c64b09337b39b231be65360134e2065e8 Mon Sep 17 00:00:00 2001
 From: Mark Asselstine <mark.asselstine@windriver.com>
 Date: Tue, 26 Feb 2013 11:43:28 -0500
 Subject: [PATCH] apic: fixup fallthrough to PIC
@@ -33,10 +33,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hw/intc/apic.c b/hw/intc/apic.c
-index 8766ed00b..581fc6deb 100644
+index ced7df49b..87f1137c9 100644
 --- a/hw/intc/apic.c
 +++ b/hw/intc/apic.c
-@@ -741,7 +741,7 @@ int apic_accept_pic_intr(APICCommonState *s)
+@@ -740,7 +740,7 @@ int apic_accept_pic_intr(APICCommonState *s)
  {
      uint32_t lvt0;
  
diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
index 0715261124..a4150620d6 100644
--- a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
+++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
@@ -1,4 +1,4 @@
-From d0bbf4a782b7caa452d91bd31512c2c625988670 Mon Sep 17 00:00:00 2001
+From 33940327a10cd5dda9d417cceef47fc34e9e269d Mon Sep 17 00:00:00 2001
 From: Oleksiy Obitotskyy <oobitots@cisco.com>
 Date: Wed, 25 Mar 2020 21:21:35 +0200
 Subject: [PATCH] qemu: Do not include file if not exists
@@ -16,7 +16,7 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 65bbeb855..3ed891bd2 100644
+index 11d3b41df..2c36df57f 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -117,7 +117,9 @@
diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
index 53675ea4bd..28988146a8 100644
--- a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
+++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
@@ -1,4 +1,4 @@
-From 7330a1ed776e5bfb322ecf36a1ee757127289895 Mon Sep 17 00:00:00 2001
+From 072e2a2a97e0376e56d975c984db3f8584022849 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Fri, 8 Jan 2021 17:27:06 +0000
 Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
diff --git a/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
index 966f78186e..7a81278537 100644
--- a/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
+++ b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
@@ -1,4 +1,4 @@
-From 4f35bc947f61b8cc3af069e236c715a75a13d0f3 Mon Sep 17 00:00:00 2001
+From 2267fcad1416f1ceef88ab052f9d69efe26f7d58 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Mon, 1 Mar 2021 13:00:47 +0000
 Subject: [PATCH] qemu: Determinism fixes
diff --git a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch
index b2237fe05d..61d7924969 100644
--- a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch
+++ b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch
@@ -1,4 +1,4 @@
-From c4e2880b044a96a232d2d362f824c898292197a1 Mon Sep 17 00:00:00 2001
+From 3d7bf86f69b5ff80dbe54dc2b3bd3dba0971e0ac Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 14 Jan 2021 06:33:04 +0000
 Subject: [PATCH] tests/meson.build: use relative path to refer to files
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/tests/unit/meson.build b/tests/unit/meson.build
-index 41e8b06c3..ce5df4957 100644
+index f768e882a..9c7931a87 100644
 --- a/tests/unit/meson.build
 +++ b/tests/unit/meson.build
-@@ -124,17 +124,17 @@ endif
+@@ -125,17 +125,17 @@ endif
  
  if have_system
    tests += {
diff --git a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
index 4bd4eafcc1..480e1c6a07 100644
--- a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
+++ b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
@@ -1,4 +1,4 @@
-From e3ab7c32d71f35577e8e28ac7cd671174739f435 Mon Sep 17 00:00:00 2001
+From 02ad3d36cfd395d05609540e23048e171da779ba Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 21 Mar 2022 10:09:38 -0700
 Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
index 4ce4e8e167..7043c942b2 100644
--- a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
+++ b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
@@ -1,4 +1,4 @@
-From 53b173fd19123b6fdcbfec3c0d458b074db09ced Mon Sep 17 00:00:00 2001
+From ef9ea8e83468ce974079964a5104df170beba85b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
 Date: Wed, 22 May 2024 14:02:55 +0200
 Subject: [PATCH] configure: lookup meson exutable from PATH
diff --git a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
index e379400ea2..bb4398f474 100644
--- a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
+++ b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
@@ -1,4 +1,4 @@
-From 79dbf4d366e322dc544c749679d8a1abbbc91b7e Mon Sep 17 00:00:00 2001
+From d62f78fea47f4b32fd0f48c46253f161cf305547 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Wed, 22 May 2024 13:58:23 +0200
 Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
diff --git a/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch b/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch
index 6ee3ae52b9..ccef853c3b 100644
--- a/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch
+++ b/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch
@@ -1,4 +1,4 @@
-From b072e3d025da9d5f266683b0b12796796c4208b3 Mon Sep 17 00:00:00 2001
+From b2b9a9e38f20fb8aa6ed26a3c38962651e3a9eae Mon Sep 17 00:00:00 2001
 From: Quan Sun <Quan.Sun@windriver.com>
 Date: Fri, 5 Jun 2026 11:54:57 +0000
 Subject: [PATCH] meson: fix close_range detection on older glibc
diff --git a/meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch b/meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch
index 25be3c2d08..d157ce0652 100644
--- a/meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch
+++ b/meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch
@@ -1,4 +1,4 @@
-From 6b613dae1eb1bad99fce6ee28f3c67fd0561b527 Mon Sep 17 00:00:00 2001
+From b8736798a109e2b3a4d5c02f5fd833bf870ba771 Mon Sep 17 00:00:00 2001
 From: Quan Sun <Quan.Sun@windriver.com>
 Date: Fri, 5 Jun 2026 11:54:58 +0000
 Subject: [PATCH] hw/scsi/vhost-scsi: fix build with older kernel headers
diff --git a/meta/recipes-devtools/qemu/qemu_11.0.1.bb b/meta/recipes-devtools/qemu/qemu_11.0.2.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu_11.0.1.bb
rename to meta/recipes-devtools/qemu/qemu_11.0.2.bb
-- 
2.47.3

[PATCH 35/45] shared-mime-info: upgrade 2.4 -> 2.5.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Explicitly disable tests, as they now have xdgmime dependency.

Drop backports.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ild-with-libxml2-2.12.0-and-clang-17.patch | 26 ---------
 ...dle-build-with-older-versions-of-GCC.patch | 54 -------------------
 ...-info_2.4.bb => shared-mime-info_2.5.1.bb} |  6 +--
 3 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
 delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_2.4.bb => shared-mime-info_2.5.1.bb} (85%)

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
deleted file mode 100644
index 936f72ccf8..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 665383306c725f299a1b373f947cda01949d49e4 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 19 Nov 2023 11:18:11 +0100
-Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
-
-Fixes #219
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/test-subclassing.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/test-subclassing.c b/src/test-subclassing.c
-index dd099e4..0758164 100644
---- a/src/test-subclassing.c
-+++ b/src/test-subclassing.c
-@@ -1,4 +1,5 @@
- #include <libxml/tree.h>
-+#include <libxml/parser.h>
- #include <stdio.h>
- #include <string.h>
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch
deleted file mode 100644
index 2af6b461b6..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 461d00fcd5c5842b9a56f7462d55d46bf21163cc Mon Sep 17 00:00:00 2001
-From: Patrick Williams <patrick@stwcx.xyz>
-Date: Fri, 1 Dec 2023 11:19:02 -0600
-Subject: [PATCH] Handle build with older versions of GCC
-
-Older versions of GCC (prior to 9.1) did not put the `std::filesystem`
-support directly into libstdcpp, but in a separate `libstdc++fs`.  Add
-meson logic to detect if an extra linker flag is necessary.
-
-Fixes #223.
-
-Tested on AlmaLinux 8 which uses GCC-8.
-
-Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/278]
----
- meson.build | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index ecc012f..93acd40 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,6 +11,7 @@ config = configuration_data()
- i18n = import('i18n')
- 
- cc = meson.get_compiler('c')
-+cxx = meson.get_compiler('cpp')
- 
- ###############################################################################
- # Project configuration
-@@ -46,6 +47,19 @@ if not xdgmime_found
-     ''')
- endif
- 
-+###############################################################################
-+# Check if GCC needs -lstdc++fs (before 9.1)
-+
-+if not cxx.links('''
-+        #include <filesystem>
-+        int main() {
-+            return std::filesystem::is_directory(
-+                std::filesystem::status("/tmp")) ? 0 : 1;
-+        }
-+        ''', name: 'std++fs-check')
-+    add_project_link_arguments('-lstdc++fs', language : 'cpp')
-+endif
-+
- ###############################################################################
- # Dependencies
- 
--- 
-2.41.0
-
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_2.5.1.bb
similarity index 85%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_2.5.1.bb
index f27061d5d1..f4551c8f59 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_2.5.1.bb
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "libxml2 glib-2.0 shared-mime-info-native xmlto-native"
 
 SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \
-           file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \
-           file://0002-Handle-build-with-older-versions-of-GCC.patch"
-SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada"
+           "
+SRCREV = "fd8ab89c20093f1bfba8fa9e302ba584fffd0fd7"
 
 inherit meson pkgconfig gettext mime
 
 EXTRA_OEMESON = " \
                  -Dupdate-mimedb=true \
                  -Dbuild-translations=${@'false' if d.getVar('USE_NLS') == 'no' else 'true'} \
+                 -Dbuild-tests=false \
                 "
 
 FILES:${PN} += "${datadir}/mime"
-- 
2.47.3

[PATCH 36/45] socat: upgrade 1.8.1.1 -> 1.8.1.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../files/0001-fix-compile-procan.c-failed.patch      | 11 ++++-------
 .../socat/{socat_1.8.1.1.bb => socat_1.8.1.3.bb}      |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename meta/recipes-connectivity/socat/{socat_1.8.1.1.bb => socat_1.8.1.3.bb} (94%)

diff --git a/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch b/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
index ea00dfa0a9..9f44c9a070 100644
--- a/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
+++ b/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
@@ -1,4 +1,4 @@
-From c4c3d5f2d4dfe8167205e8d20b4cb7a197706c16 Mon Sep 17 00:00:00 2001
+From 15c33fde40777ddbc8eb51f8b424032f2dd77189 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Wed, 27 Nov 2024 04:09:59 -0800
 Subject: [PATCH] fix compile procan.c failed
@@ -32,10 +32,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 631d31d..103d4d1 100644
+index 629cb7e..4368a3f 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -110,7 +110,7 @@ socat: socat.o libxio.a
+@@ -112,7 +112,7 @@ socat: socat.o libxio.a
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
  
  procan.o: $(srcdir)/procan.c
@@ -44,7 +44,7 @@ index 631d31d..103d4d1 100644
  
  PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
  procan: $(PROCAN_OBJS)
-@@ -132,9 +132,9 @@ install: progs $(srcdir)/doc/socat.1
+@@ -134,9 +134,9 @@ install: progs $(srcdir)/doc/socat.1
  	mkdir -p $(DESTDIR)$(BINDEST)
  	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1
  	ln -sf socat1 $(DESTDIR)$(BINDEST)/socat
@@ -57,6 +57,3 @@ index 631d31d..103d4d1 100644
  	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
  	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
  	mkdir -p $(DESTDIR)$(MANDEST)/man1
--- 
-2.25.1
-
diff --git a/meta/recipes-connectivity/socat/socat_1.8.1.1.bb b/meta/recipes-connectivity/socat/socat_1.8.1.3.bb
similarity index 94%
rename from meta/recipes-connectivity/socat/socat_1.8.1.1.bb
rename to meta/recipes-connectivity/socat/socat_1.8.1.3.bb
index e662c79a75..636c75b117 100644
--- a/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.8.1.3.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
            file://0001-fix-compile-procan.c-failed.patch \
 "
 
-SRC_URI[sha256sum] = "5ebc636b7f427053f98806696521653a614c7e06464910353cbf54e2327adc1b"
+SRC_URI[sha256sum] = "25bc6476292b2e614220989c77b0b6fca87bb2525d9747b31a6639b1fb602418"
 
 inherit autotools
 
-- 
2.47.3

[PATCH 37/45] sqlite3: upgrade 3.53.2 -> 3.53.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch        | 2 +-
 .../sqlite/{sqlite3_3.53.2.bb => sqlite3_3.53.3.bb}             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3.53.2.bb => sqlite3_3.53.3.bb} (74%)

diff --git a/meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch b/meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch
index b4231438cc..dc49a3731f 100644
--- a/meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch
+++ b/meta/recipes-support/sqlite/sqlite3/0001-Add-option-to-disable-zlib.patch
@@ -1,4 +1,4 @@
-From a324ff380e6e83141f37cbee7b89e87282deb349 Mon Sep 17 00:00:00 2001
+From 7c6c5749f809eb3fd50fbaabb4ca6379968b3c5e Mon Sep 17 00:00:00 2001
 From: Peter Marko <peter.marko@siemens.com>
 Date: Sun, 12 Oct 2025 23:32:46 +0200
 Subject: [PATCH] Add option to disable zlib
diff --git a/meta/recipes-support/sqlite/sqlite3_3.53.2.bb b/meta/recipes-support/sqlite/sqlite3_3.53.3.bb
similarity index 74%
rename from meta/recipes-support/sqlite/sqlite3_3.53.2.bb
rename to meta/recipes-support/sqlite/sqlite3_3.53.3.bb
index 38045f1604..655f3a2b96 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.53.2.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.53.3.bb
@@ -4,6 +4,6 @@ LICENSE = "blessing"
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
 
 SRC_URI = "http://www.sqlite.org/2026/sqlite-autoconf-${SQLITE_PV}.tar.gz"
-SRC_URI[sha256sum] = "588ad51949419a56ebe81fe56193d510c559eb94c9a57748387860b5d3069316"
+SRC_URI[sha256sum] = "c917d7db16648ec95f714974ace5e5dcf46b7dc70e26600a0a102a3141125db0"
 
 SRC_URI += "file://0001-Add-option-to-disable-zlib.patch"
-- 
2.47.3

[PATCH 38/45] strace: upgrade 7.0 -> 7.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Tweak ptest Makefile to avoid make error due to an irrelevant missing file on target.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...nfigure-Use-autoconf-macro-to-detect-largefile-sup.patch | 2 +-
 .../0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch   | 2 +-
 .../strace/0001-strace-fix-reproducibilty-issues.patch      | 2 +-
 .../strace/0002-tests-Replace-off64_t-with-off_t.patch      | 2 +-
 meta/recipes-devtools/strace/strace/Makefile-ptest.patch    | 6 +++---
 meta/recipes-devtools/strace/strace/ptest-spacesave.patch   | 2 +-
 meta/recipes-devtools/strace/strace/skip-load.patch         | 6 +++---
 meta/recipes-devtools/strace/strace/update-gawk-paths.patch | 2 +-
 .../strace/{strace_7.0.bb => strace_7.1.bb}                 | 3 ++-
 9 files changed, 14 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/strace/{strace_7.0.bb => strace_7.1.bb} (95%)

diff --git a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
index bda5156cdf..5a7d05ae41 100644
--- a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
+++ b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
@@ -1,4 +1,4 @@
-From 36df82284b1e8c3d7338c315016a8e74c0978e32 Mon Sep 17 00:00:00 2001
+From 65fb22e302a4dbec675377e61593b52c2e291705 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 15 Dec 2022 15:54:27 -0800
 Subject: [PATCH] configure: Use autoconf macro to detect largefile support
diff --git a/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch b/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
index 920c2e4faf..d3e35077de 100644
--- a/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
+++ b/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
@@ -1,4 +1,4 @@
-From dd821aebdefb3531202bcd51fce5e2bd74c1512d Mon Sep 17 00:00:00 2001
+From 77790a889ca5227936e2de2c587ef1fd9c8e718c Mon Sep 17 00:00:00 2001
 From: Khem Raj <khem.raj@oss.qualcomm.com>
 Date: Fri, 10 Apr 2026 23:39:47 +0000
 Subject: [PATCH] m4: Backport ax_prog_cc_for_build.m4 macros
diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
index 77f90bf0d1..78509da2b1 100644
--- a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
+++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
@@ -1,4 +1,4 @@
-From bb0cd804214054ef95193daa0b7076ed5be1c881 Mon Sep 17 00:00:00 2001
+From 455905ce2a3f886264e6344051654d7c2d9faf88 Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <jpuhlman@mvista.com>
 Date: Wed, 11 Mar 2020 19:56:55 +0000
 Subject: [PATCH] strace: fix reproducibilty issues
diff --git a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
index 7daf3f6763..ec1905321a 100644
--- a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
+++ b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
@@ -1,4 +1,4 @@
-From 2d6384cd2b6b923ea3eb6863beb0bfaf6bf628c2 Mon Sep 17 00:00:00 2001
+From 447203bdced57a521534c4fb7d1962318a81c1bd Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 15 Dec 2022 15:56:13 -0800
 Subject: [PATCH] tests: Replace off64_t with off_t
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 3d23e34244..d864b68fc1 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@
-From 21747b62c36689b68fac7e987a9b93b998f692e3 Mon Sep 17 00:00:00 2001
+From 6f9eb5907fa2a7d6127737e41fb4e9fb5fb091d3 Mon Sep 17 00:00:00 2001
 From: Gabriel Barbu <gabriel.barbu@enea.com>
 Date: Thu, 25 Jul 2013 15:28:33 +0200
 Subject: [PATCH] strace: Add ptest
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7d80e07..1e0e064 100644
+index f37d053..975f878 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -24,7 +24,7 @@ index 7d80e07..1e0e064 100644
  AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS)
  bundled_CPPFLAGS =
  if USE_BUNDLED_HEADERS
-@@ -950,3 +951,22 @@ BUILT_SOURCES = ksysent.h
+@@ -967,3 +968,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS)
  CLEANFILES = ksysent.h
  
  include ../src/scno.am
diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
index 14ad35be74..33f9c86894 100644
--- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
+++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
@@ -1,4 +1,4 @@
-From 0b3d278fa808a21d4300a71d062807f905671bf9 Mon Sep 17 00:00:00 2001
+From 868dff21f47036dec4db603129d46d4f8ea4a29d Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Wed, 29 May 2019 00:10:32 +0100
 Subject: [PATCH] strace: Tweak ptest disk space management
diff --git a/meta/recipes-devtools/strace/strace/skip-load.patch b/meta/recipes-devtools/strace/strace/skip-load.patch
index dc88706948..1bdcb77ddb 100644
--- a/meta/recipes-devtools/strace/strace/skip-load.patch
+++ b/meta/recipes-devtools/strace/strace/skip-load.patch
@@ -1,4 +1,4 @@
-From 7fc69711b5e216c385b22a5b64c6c7c8be693600 Mon Sep 17 00:00:00 2001
+From 537e44aa0204590171936eec0fcd279b74fbbfee Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Sat, 30 Aug 2025 00:47:03 +0200
 Subject: [PATCH] strace: skip a number of load-sensitive tests
@@ -49,7 +49,7 @@ index 41928de..f8a87cb 100755
 +skip_ "Test not reliable under load"
  run_strace_match_diff -a20 
 diff --git a/tests/strace-r.test b/tests/strace-r.test
-index 8299737..e894234 100755
+index a85558d..9ae9677 100755
 --- a/tests/strace-r.test
 +++ b/tests/strace-r.test
 @@ -9,6 +9,7 @@
@@ -59,4 +59,4 @@ index 8299737..e894234 100755
 +skip_ "Test not reliable under load"
  r_opt="${1:--r}"
  
- run_prog ../sleep 0
+ run_prog ../sleep-timing 0 "$TIMING_FILE"
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
index c47ca08dd4..a83eb49ba3 100644
--- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
+++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
@@ -1,4 +1,4 @@
-From 6bc97ed4e26ca4d275c10f5b4f56fc43a8e12925 Mon Sep 17 00:00:00 2001
+From 7066b2e49ddbde0379ca52cebeefeca4f80fb75b Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Mon, 18 Jan 2016 11:01:00 -0800
 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk
diff --git a/meta/recipes-devtools/strace/strace_7.0.bb b/meta/recipes-devtools/strace/strace_7.1.bb
similarity index 95%
rename from meta/recipes-devtools/strace/strace_7.0.bb
rename to meta/recipes-devtools/strace/strace_7.1.bb
index fa86f7bb4e..c4ca3a7f27 100644
--- a/meta/recipes-devtools/strace/strace_7.0.bb
+++ b/meta/recipes-devtools/strace/strace_7.1.bb
@@ -19,7 +19,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \
 SRC_URI:append:libc-musl = "\
            file://0001-Ignore-pwritev-pwrite64-tests-on-musl.patch \
            "
-SRC_URI[sha256sum] = "6c92419be3f2ec560b31728a4652217c59864c8642ba7b1b3771b1b013ad074b"
+SRC_URI[sha256sum] = "81743ecf2a5b44186b2f5038afdc8beda7e5c70aed15b4fbfbcc6e9ece24490f"
 
 inherit autotools github-releases ptest
 
@@ -51,6 +51,7 @@ do_install_ptest() {
 	sed -e 's/^srcdir = .*/srcdir = ..\/..\/ptest\/tests/' \
 	    -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
 	    -e '/^CC_FOR_BUILD/s/\s-std=gnu23//g' \
+            -e '/^_hide_from_automake/d' \
 	    -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
 }
 
-- 
2.47.3

[PATCH 39/45] tcl: upgrade 9.0.3 -> 9.0.4

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/tcltk/{tcl_9.0.3.bb => tcl_9.0.4.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/tcltk/{tcl_9.0.3.bb => tcl_9.0.4.bb} (97%)

diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.3.bb b/meta/recipes-devtools/tcltk/tcl_9.0.4.bb
similarity index 97%
rename from meta/recipes-devtools/tcltk/tcl_9.0.3.bb
rename to meta/recipes-devtools/tcltk/tcl_9.0.4.bb
index ce8598fee6..8cabd77d7f 100644
--- a/meta/recipes-devtools/tcltk/tcl_9.0.3.bb
+++ b/meta/recipes-devtools/tcltk/tcl_9.0.4.bb
@@ -22,7 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \
            file://0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch \
            file://0004-tcl-update-the-header-location.patch \
            "
-SRC_URI[sha256sum] = "407a073ee8f718200c3a004bc2186deccc33356ee5112a71d8b01b55230f4ee4"
+SRC_URI[sha256sum] = "5d265f3499b588681825d8093177830707b7035ad866b17189a3a6ab6dade0ff"
 
 UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html"
 UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src"
-- 
2.47.3

[PATCH 40/45] ttyrun: upgrade 2.42.1 -> 2.43.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/ttyrun/{ttyrun_2.42.1.bb => ttyrun_2.43.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ttyrun/{ttyrun_2.42.1.bb => ttyrun_2.43.0.bb} (94%)

diff --git a/meta/recipes-core/ttyrun/ttyrun_2.42.1.bb b/meta/recipes-core/ttyrun/ttyrun_2.43.0.bb
similarity index 94%
rename from meta/recipes-core/ttyrun/ttyrun_2.42.1.bb
rename to meta/recipes-core/ttyrun/ttyrun_2.43.0.bb
index c9dd4d564d..74204013c2 100644
--- a/meta/recipes-core/ttyrun/ttyrun_2.42.1.bb
+++ b/meta/recipes-core/ttyrun/ttyrun_2.43.0.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af"
 
 SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master;tag=v${PV}"
-SRCREV = "77083b1cbbd463a25cf1a94fc026b5401575bc5e"
+SRCREV = "f85c8ebba0b482e677de1f2c4d8b67b588fe654d"
 
 CVE_PRODUCT = "s390-tools"
 
-- 
2.47.3

[PATCH 41/45] vulkan-samples: upgrade to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index c7e09b4b7d..75d7a39eb6 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -9,7 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protoc
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "ab1e93d4a5dadf4c804fb6abbbe0b27dfa912b5a"
+SRCREV = "383471195757abdd43339c464db60449619d4f84"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 
-- 
2.47.3

[PATCH 42/45] vulkan: upgrade 1.4.350.0 -> 1.4.350.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

The release notes claim a fix for .pc file in vulkan loader:
https://vulkan.lunarg.com/doc/sdk/1.4.350.1/linux/release_notes.html

but the .1 tag points to the same commit as .0 tag:
https://github.com/KhronosGroup/Vulkan-Loader/tags
(and the same commit is tagged as .1 in all other components).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glslang/glslang/0001-generate-glslang-pkg-config.patch      | 2 +-
 .../glslang/{glslang_1.4.350.0.bb => glslang_1.4.350.1.bb}      | 0
 .../{spirv-headers_1.4.350.0.bb => spirv-headers_1.4.350.1.bb}  | 0
 .../spir/{spirv-tools_1.4.350.0.bb => spirv-tools_1.4.350.1.bb} | 0
 ...{vulkan-headers_1.4.350.0.bb => vulkan-headers_1.4.350.1.bb} | 0
 .../{vulkan-loader_1.4.350.0.bb => vulkan-loader_1.4.350.1.bb}  | 0
 .../{vulkan-tools_1.4.350.0.bb => vulkan-tools_1.4.350.1.bb}    | 0
 ...aries_1.4.350.0.bb => vulkan-utility-libraries_1.4.350.1.bb} | 0
 ...ayers_1.4.350.0.bb => vulkan-validation-layers_1.4.350.1.bb} | 0
 .../{vulkan-volk_1.4.350.0.bb => vulkan-volk_1.4.350.1.bb}      | 0
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/glslang/{glslang_1.4.350.0.bb => glslang_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/spir/{spirv-headers_1.4.350.0.bb => spirv-headers_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/spir/{spirv-tools_1.4.350.0.bb => spirv-tools_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/vulkan/{vulkan-headers_1.4.350.0.bb => vulkan-headers_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/vulkan/{vulkan-loader_1.4.350.0.bb => vulkan-loader_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/vulkan/{vulkan-tools_1.4.350.0.bb => vulkan-tools_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/vulkan/{vulkan-utility-libraries_1.4.350.0.bb => vulkan-utility-libraries_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/vulkan/{vulkan-validation-layers_1.4.350.0.bb => vulkan-validation-layers_1.4.350.1.bb} (100%)
 rename meta/recipes-graphics/vulkan/{vulkan-volk_1.4.350.0.bb => vulkan-volk_1.4.350.1.bb} (100%)

diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
index d74f37db91..f06f12b303 100644
--- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
+++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -1,4 +1,4 @@
-From ee46f2f608ccbe9617ce41235d047f080d972ff7 Mon Sep 17 00:00:00 2001
+From 2c7e21605b0324b4afd51270592bc6cb0a0cca5f Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sun, 7 Feb 2021 01:30:39 +0000
 Subject: [PATCH] generate glslang pkg-config
diff --git a/meta/recipes-graphics/glslang/glslang_1.4.350.0.bb b/meta/recipes-graphics/glslang/glslang_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/glslang/glslang_1.4.350.0.bb
rename to meta/recipes-graphics/glslang/glslang_1.4.350.1.bb
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.4.350.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/spir/spirv-headers_1.4.350.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.4.350.1.bb
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.4.350.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/spir/spirv-tools_1.4.350.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.4.350.1.bb
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.4.350.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.4.350.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.4.350.1.bb
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.4.350.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.4.350.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.4.350.1.bb
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.4.350.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.4.350.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.4.350.1.bb
diff --git a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.350.0.bb b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.350.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.350.1.bb
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.350.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.350.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.350.1.bb
diff --git a/meta/recipes-graphics/vulkan/vulkan-volk_1.4.350.0.bb b/meta/recipes-graphics/vulkan/vulkan-volk_1.4.350.1.bb
similarity index 100%
rename from meta/recipes-graphics/vulkan/vulkan-volk_1.4.350.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-volk_1.4.350.1.bb
-- 
2.47.3

[PATCH 43/45] waffle: upgrade 1.8.2 -> 1.8.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../waffle/{waffle_1.8.2.bb => waffle_1.8.3.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/waffle/{waffle_1.8.2.bb => waffle_1.8.3.bb} (97%)

diff --git a/meta/recipes-graphics/waffle/waffle_1.8.2.bb b/meta/recipes-graphics/waffle/waffle_1.8.3.bb
similarity index 97%
rename from meta/recipes-graphics/waffle/waffle_1.8.2.bb
rename to meta/recipes-graphics/waffle/waffle_1.8.3.bb
index dd31d4057d..377187b499 100644
--- a/meta/recipes-graphics/waffle/waffle_1.8.2.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.8.3.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
                     file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
 
 SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.8"
-SRCREV = "70dd251e0390401ab9dc4f768ee9665863f4c268"
+SRCREV = "920b709036d7313b59007435786fc3da61af31ab"
 
 inherit meson features_check lib_package bash-completion pkgconfig
 
-- 
2.47.3

[PATCH 44/45] wic: upgrade 0.3.0 -> 0.3.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/wic/{wic_0.3.0.bb => wic_0.3.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/wic/{wic_0.3.0.bb => wic_0.3.1.bb} (90%)

diff --git a/meta/recipes-support/wic/wic_0.3.0.bb b/meta/recipes-support/wic/wic_0.3.1.bb
similarity index 90%
rename from meta/recipes-support/wic/wic_0.3.0.bb
rename to meta/recipes-support/wic/wic_0.3.1.bb
index 7dbf84b039..d9b4cc05c4 100644
--- a/meta/recipes-support/wic/wic_0.3.0.bb
+++ b/meta/recipes-support/wic/wic_0.3.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4ee23c52855c222cba72583d301d2338"
 
 SRC_URI = "git://git.yoctoproject.org/wic.git;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "5974ade11032f218841d9f449ef0efeee3f9a2ca"
+SRCREV = "6c66da65bf2aac618092811c13792dcbd453d140"
 
 CVE_PRODUCT = "yoctoproject:wic"
 
-- 
2.47.3

[PATCH 45/45] xkeyboard-config: upgrade 2.47 -> 2.48

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{xkeyboard-config_2.47.bb => xkeyboard-config_2.48.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.47.bb => xkeyboard-config_2.48.bb} (91%)

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.47.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.48.bb
similarity index 91%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.47.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.48.bb
index cbca31fd62..dc0d1e1677 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.47.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.48.bb
@@ -13,7 +13,7 @@ LICENSE = "MIT & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=faa756e04053029ddc602caf99e5ef1d"
 
 SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "e59984416a72d58b46a52bfec1b1361aa7d84354628227ee2783626c7a6db6b6"
+SRC_URI[sha256sum] = "b77041324f0109f77161ee43743fe04baa485866af8460d31e476ad3f7648fd5"
 
 SECTION = "x11/libs"
 DEPENDS = "util-macros libxslt-native"
-- 
2.47.3