From a055416f1e953538501509b701a2a67f0f53417a Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Mon, 15 Sep 2025 10:49:30 +0000
Subject: [PATCH] babeltrace2: upgrade 2.1.1 -> 2.1.2

---
 ...ob_get_length-return-size_t-instead-.patch |  4 ++--
 ...001-Make-manpages-multilib-identical.patch |  6 ++----
 ...explicitly-only-build-shared-plugins.patch | 17 +++++++---------
 ...-fix-test-applications-in-cpp-common.patch |  5 +----
 ...sts-set-the-correct-plugin-directory.patch | 11 ++++------
 .../babeltrace2/external-python-tests.patch   | 20 ++++++++-----------
 ...eltrace2_2.1.1.bb => babeltrace2_2.1.2.bb} |  2 +-
 7 files changed, 25 insertions(+), 40 deletions(-)
 rename meta/recipes-kernel/lttng/{babeltrace2_2.1.1.bb => babeltrace2_2.1.2.bb} (99%)

diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
index 4dffa7bfa5..dcab6e101c 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
@@ -1,4 +1,4 @@
-From a73cef80a0d4129f74ab2e160a15693235aad4d1 Mon Sep 17 00:00:00 2001
+From a35a3bec93e05aa4850a1d718ee93a869acb6b4c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 20 Mar 2025 18:10:08 -0700
 Subject: [PATCH] Cast result of bt_field_blob_get_length to size_t in
@@ -24,7 +24,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp
-index 8b291f7a..3a7d30a4 100644
+index 8b291f7a1..3a7d30a4f 100644
 --- a/src/cpp-common/bt2/field.hpp
 +++ b/src/cpp-common/bt2/field.hpp
 @@ -1136,7 +1136,7 @@ public:
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
index c2b76b1ed5..a6e4663f11 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
@@ -1,4 +1,4 @@
-From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001
+From d10e2748492e294a9238cc3bd9cf8c398e8df020 Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <jpuhlman@mvista.com>
 Date: Mon, 9 Mar 2020 21:10:35 +0000
 Subject: [PATCH] Make manpages multilib identical
@@ -16,7 +16,7 @@ index 88fb13ce2..27858b720 100644
 --- a/doc/man/asciidoc-attrs.conf.in
 +++ b/doc/man/asciidoc-attrs.conf.in
 @@ -4,8 +4,8 @@
-
+ 
  [attributes]
  # default values
 -system_plugin_path="@LIBDIR@/babeltrace2/plugins"
@@ -26,5 +26,3 @@ index 88fb13ce2..27858b720 100644
  babeltrace_version="@PACKAGE_VERSION@"
  enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
  defrdport=5344
--- 
-2.34.1
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-src-explicitly-only-build-shared-plugins.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-src-explicitly-only-build-shared-plugins.patch
index 7f8d5c7df3..cf25165a79 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-src-explicitly-only-build-shared-plugins.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-src-explicitly-only-build-shared-plugins.patch
@@ -1,4 +1,4 @@
-From 3f43a0554c73287973047b44ae5e196b7c995c60 Mon Sep 17 00:00:00 2001
+From f272cffc672e5503b74984a272fac051ee2ef09b Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Thu, 21 Aug 2025 12:42:20 +0100
 Subject: [PATCH] src: explicitly only build shared plugins
@@ -17,10 +17,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 0567131b..7aa46b20 100644
+index e527c6817..b5d8758b0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -619,7 +619,7 @@ nodist_EXTRA_python_plugin_provider_babeltrace2_python_plugin_provider_la_SOURCE
+@@ -614,7 +614,7 @@ nodist_EXTRA_python_plugin_provider_babeltrace2_python_plugin_provider_la_SOURCE
  python_plugin_provider_babeltrace2_python_plugin_provider_la_LDFLAGS = \
  	$(AM_LDFLAGS) \
  	$(LT_NO_UNDEFINED) \
@@ -29,7 +29,7 @@ index 0567131b..7aa46b20 100644
  	$(PYTHON_LDFLAGS)
  
  python_plugin_provider_babeltrace2_python_plugin_provider_la_CPPFLAGS = \
-@@ -669,7 +669,7 @@ plugins_utils_babeltrace_plugin_utils_la_SOURCES = \
+@@ -664,7 +664,7 @@ plugins_utils_babeltrace_plugin_utils_la_SOURCES = \
  plugins_utils_babeltrace_plugin_utils_la_LDFLAGS = \
  	$(AM_LDFLAGS) \
  	$(LT_NO_UNDEFINED) \
@@ -38,7 +38,7 @@ index 0567131b..7aa46b20 100644
  
  plugins_utils_babeltrace_plugin_utils_la_LIBADD = \
  	plugins/common/muxing/libmuxing.la
-@@ -775,7 +775,7 @@ plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \
+@@ -770,7 +770,7 @@ plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \
  plugins_ctf_babeltrace_plugin_ctf_la_LDFLAGS = \
  	$(AM_LDFLAGS) \
  	$(LT_NO_UNDEFINED) \
@@ -47,7 +47,7 @@ index 0567131b..7aa46b20 100644
  
  plugins_ctf_babeltrace_plugin_ctf_la_LIBADD = \
  	plugins/ctf/common/metadata/libctf-parser.la \
-@@ -816,7 +816,7 @@ plugins_text_babeltrace_plugin_text_la_SOURCES = \
+@@ -811,7 +811,7 @@ plugins_text_babeltrace_plugin_text_la_SOURCES = \
  plugins_text_babeltrace_plugin_text_la_LDFLAGS = \
  	$(AM_LDFLAGS) \
  	$(LT_NO_UNDEFINED) \
@@ -56,7 +56,7 @@ index 0567131b..7aa46b20 100644
  
  plugins_text_babeltrace_plugin_text_la_LIBADD =
  
-@@ -840,7 +840,7 @@ plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_SOURCES = \
+@@ -835,7 +835,7 @@ plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_SOURCES = \
  plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LDFLAGS = \
  	$(AM_LDFLAGS) \
  	$(LT_NO_UNDEFINED) \
@@ -65,6 +65,3 @@ index 0567131b..7aa46b20 100644
  	$(ELFUTILS_LIBS)
  
  plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LIBADD = \
--- 
-2.43.0
-
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-fix-test-applications-in-cpp-common.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-fix-test-applications-in-cpp-common.patch
index 87f94fb087..8ca88b7521 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-fix-test-applications-in-cpp-common.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-fix-test-applications-in-cpp-common.patch
@@ -1,4 +1,4 @@
-From 1dc81f272855d94e6a78f7d10ea952745d991aa9 Mon Sep 17 00:00:00 2001
+From 2e733901de561f2de7af811b44e4fe467a4698c1 Mon Sep 17 00:00:00 2001
 From: Bin Lan <bin.lan.cn@windriver.com>
 Date: Tue, 11 Mar 2025 17:19:11 +0800
 Subject: [PATCH] Tests: fix test applications in cpp-common are needed to
@@ -124,6 +124,3 @@ index 000000000..8c65daa94
 +source "$UTILSSH"
 +
 +"${BT_TESTS_BUILDDIR}/cpp-common/test-uuid" "$BT_TESTS_BT2_BIN"
--- 
-2.34.1
-
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-set-the-correct-plugin-directory.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-set-the-correct-plugin-directory.patch
index 7ac7582ad7..aa6fa38064 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-set-the-correct-plugin-directory.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-set-the-correct-plugin-directory.patch
@@ -1,11 +1,11 @@
-From 32494b1726a881883cb6d317ab76d1ec3f1fa740 Mon Sep 17 00:00:00 2001
+From 7f6e5f2b30501732bcbc5ccdc3a60520594fb82e Mon Sep 17 00:00:00 2001
 From: Bin Lan <bin.lan.cn@windriver.com>
 Date: Wed, 5 Mar 2025 10:51:11 +0800
 Subject: [PATCH] tests: set the correct directory of plugin shared library
 
-The plugin shared libraries are put in test-plugins-plugins/.libs when 
-building in a host. test-plugins-plugins/.libs is not exist when cross 
-build. The plugin shared libraries are put in test-plugins-plugins 
+The plugin shared libraries are put in test-plugins-plugins/.libs when
+building in a host. test-plugins-plugins/.libs is not exist when cross
+build. The plugin shared libraries are put in test-plugins-plugins
 directory when cross build.
 
 Upstream-Status: Inappropriate [oe specific]
@@ -25,6 +25,3 @@ index f83e42baa..939236393 100755
  
 -"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins/.libs"
 +"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins"
--- 
-2.34.1
-
diff --git a/meta/recipes-kernel/lttng/babeltrace2/external-python-tests.patch b/meta/recipes-kernel/lttng/babeltrace2/external-python-tests.patch
index 960b33d959..e9368467d5 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/external-python-tests.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/external-python-tests.patch
@@ -1,7 +1,7 @@
-From d2f528aa09a9001e63710470f6b700d122494961 Mon Sep 17 00:00:00 2001
+From 7f86ecb43b521f477900f3e988a9a1e625200e86 Mon Sep 17 00:00:00 2001
 From: Michael Jeanson <mjeanson@efficios.com>
 Date: Thu, 14 Aug 2025 12:27:16 -0400
-Subject: [PATCH babeltrace] bindings/python: Allow tests to be run externally
+Subject: [PATCH] bindings/python: Allow tests to be run externally
 
 Upstream doesn't officially support running their tests externally. The python
 bindings need some tweaks to work in this configuration.
@@ -13,13 +13,12 @@ Upstream-Status: Inappropriate [oe specific]
 
 Change-Id: I89555a3fbd821baa7088acc154e81665102286b8
 ---
- .../python/bt2/test_component_descriptor.py   |   2 +-
- tests/bindings/python/bt2/test_graph.py       |   2 +-
- tests/bindings/python/bt2/test_plugin.py      |  10 +-
- .../python/bt2/test_query_executor.py         |   2 +-
- tests/utils/utils.sh                          |   2 +-
- 6 files changed, 117 insertions(+), 9 deletions(-)
- create mode 100644 tests/0001-wip-tests-yocto.patch
+ tests/bindings/python/bt2/test_component_descriptor.py |  2 +-
+ tests/bindings/python/bt2/test_graph.py                |  2 +-
+ tests/bindings/python/bt2/test_plugin.py               | 10 +++++-----
+ tests/bindings/python/bt2/test_query_executor.py       |  2 +-
+ tests/utils/utils.sh                                   |  2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/tests/bindings/python/bt2/test_component_descriptor.py b/tests/bindings/python/bt2/test_component_descriptor.py
 index dcad514eb..49a3c054d 100644
@@ -121,6 +120,3 @@ index 28db595d1..05b87f64e 100644
  
  # Colon-separated list of project plugin paths, if not set
  _bt_tests_set_var_def BT_TESTS_BABELTRACE_PLUGIN_PATH \
--- 
-2.47.2
-
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.1.2.bb
similarity index 99%
rename from meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb
rename to meta/recipes-kernel/lttng/babeltrace2_2.1.2.bb
index 945f82ef34..b0cd6efde1 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.1.2.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=http
            file://external-python-tests.patch \
            file://0001-src-explicitly-only-build-shared-plugins.patch \
            "
-SRCREV = "7f2f8cd6dac497cbb466efb31219b531c62013f5"
+SRCREV = "d0e946a71faf5f0c2d7f1fb5b92a369983e9cf10"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
 
 inherit autotools pkgconfig ptest setuptools3-base
-- 
2.47.1

