diff mbox series

[AUH] lttng-tools: upgrading to 2.14.1 FAILED

Message ID 0101019c19559aca-24f32ddc-dc97-4cff-8f6e-9679625adaca-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] lttng-tools: upgrading to 2.14.1 FAILED | expand

Commit Message

auh@yoctoproject.org Feb. 1, 2026, 1:12 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *lttng-tools* to *2.14.1* has Failed(do_compile).

Detailed error information:

do_compile failed



Next steps:
    - apply the patch: git am 0001-lttng-tools-upgrade-2.14.0-2.14.1.patch
    - check the changes to upstream patches and summarize them in the commit message,
    - compile an image that contains the package
    - perform some basic sanity tests
    - amend the patch and sign it off: git commit -s --reset-author --amend
    - send it to the appropriate mailing list

Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.

Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper

-- >8 --
From f668c5e1e70624ba4b5c6268b41e384199b4d8f9 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Sun, 1 Feb 2026 07:03:48 +0000
Subject: [PATCH] lttng-tools: upgrade 2.14.0 -> 2.14.1

---
 ...Remove-the-scope-resolution-operator.patch | 41 ------------------
 ...onstructor-change-rpath-to-libdir-li.patch | 43 -------------------
 ...p-index-allocator-symbols-from-versi.patch | 43 -------------------
 ...-tests-do-not-strip-a-helper-library.patch |  2 +-
 .../lttng/lttng-tools/disable-tests.patch     |  4 +-
 .../lttng/lttng-tools/disable-tests2.patch    | 20 ++++++---
 .../lttng/lttng-tools/libc++.patch            | 33 +++++++++-----
 ...-tools_2.14.0.bb => lttng-tools_2.14.1.bb} |  5 +--
 8 files changed, 40 insertions(+), 151 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-liblttng-ctl-drop-index-allocator-symbols-from-versi.patch
 rename meta/recipes-kernel/lttng/{lttng-tools_2.14.0.bb => lttng-tools_2.14.1.bb} (96%)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
deleted file mode 100644
index 02bd1d1db0..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From da83d31a8dd555c28eb27bd7a7d3c53b51d5f276 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Sun, 20 Jul 2025 16:37:57 +0800
-Subject: [PATCH] eventfd.cpp: Remove the scope resolution operator
-
-Remove the scope resolution operator :: to fix the below build failure
-with musl.
- | ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:18:31: error: expected id-expression before numeric constant
- |    18 |                 int flags = ::EFD_CLOEXEC;
- |       |                               ^~~~~~~~~~~
- | ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp:21:36: error: expected id-expression before numeric constant
- |    21 |                         flags |= ::EFD_SEMAPHORE;
- |       |                                    ^~~~~~~~~~~~~
-
-Upstream-Status: Pending [The message to lttng-dev awaits moderator approval]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- src/common/eventfd.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/common/eventfd.cpp b/src/common/eventfd.cpp
-index fe5b549..3379b0b 100644
---- a/src/common/eventfd.cpp
-+++ b/src/common/eventfd.cpp
-@@ -15,10 +15,10 @@
- 
- lttng::eventfd::eventfd(bool use_semaphore_semantics, std::uint64_t initial_value) :
- 	file_descriptor([use_semaphore_semantics, initial_value]() {
--		int flags = ::EFD_CLOEXEC;
-+		int flags = EFD_CLOEXEC;
- 
- 		if (use_semaphore_semantics) {
--			flags |= ::EFD_SEMAPHORE;
-+			flags |= EFD_SEMAPHORE;
- 		}
- 
- 		const auto raw_fd = ::eventfd(initial_value, flags);
--- 
-2.34.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch
deleted file mode 100644
index 562381b5fd..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-From 673e8ef4763ea9a9c67248e6a1a7eadfc4bc278d Mon Sep 17 00:00:00 2001
-From: Liu Yiding <liuyd.fnst@fujitsu.com>
-Date: Thu, 3 Jul 2025 19:00:25 +0800
-Subject: [PATCH] gen-ust-events-constructor: change rpath to $libdir like
- others do
-
-set rpath to abs_builddir will cause issue like:
-ERROR: lttng-tools-2.14.0-r0 do_package_qa: QA Issue: File /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-c-constructor-so in package lttng-tools-ptest contains reference to TMPDIR [buildpaths]
-ERROR: lttng-tools-2.14.0-r0 do_package_qa: QA Issue: File /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-constructor-so in package lttng-tools-ptest contains reference to TMPDIR [buildpaths]
-
-userspace-probe-elf-binary and userspace-probe-sdt-binary set rpath to libdir
- |$ grep -nr "rpath" */Makefile.am
- |gen-ust-events-constructor/Makefile.am:29:                         -rpath $(abs_builddir)
- |userspace-probe-elf-binary/Makefile.am:8:libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath $(libdir)
- |userspace-probe-sdt-binary/Makefile.am:25:libfoo_la_LDFLAGS = -module -shared -avoid-version -rpath $(libdir)
- |userspace-probe-sdt-binary/Makefile.am:31:libbar_la_LDFLAGS = -module -shared -avoid-version -rpath $(libdir)
- |userspace-probe-sdt-binary/Makefile.am:37:libzzz_la_LDFLAGS = -module -shared -avoid-version -rpath $(libdir)
-
-Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
-
-Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/171]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- tests/utils/testapp/gen-ust-events-constructor/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/utils/testapp/gen-ust-events-constructor/Makefile.am b/tests/utils/testapp/gen-ust-events-constructor/Makefile.am
-index 6c09cf585..3eb26fba2 100644
---- a/tests/utils/testapp/gen-ust-events-constructor/Makefile.am
-+++ b/tests/utils/testapp/gen-ust-events-constructor/Makefile.am
-@@ -26,7 +26,7 @@ else
- # Force the shared flag on the noinst libraries since they are
- # only built static by default
- FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
--			   -rpath $(abs_builddir)
-+			   -rpath $(libdir)
- 
- noinst_LTLIBRARIES += libtp-so-provider.la libtp-so-define.la \
- 	libtp-so_c-provider.la libtp-so_c-define.la
--- 
-2.34.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-liblttng-ctl-drop-index-allocator-symbols-from-versi.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-liblttng-ctl-drop-index-allocator-symbols-from-versi.patch
deleted file mode 100644
index 3a535470da..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-liblttng-ctl-drop-index-allocator-symbols-from-versi.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-From adafa15a0ea145e1e98f68e2a56512e83f1f6798 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 19 Aug 2025 20:06:21 -0700
-Subject: [PATCH] liblttng-ctl: drop index allocator symbols from version
- script
-
-The lttng_index_allocator_* functions are implemented in libcommon-gpl,
-not in liblttng-ctl. Since liblttng-ctl does not link against
-libcommon-gpl and does not export these symbols, referencing them in
-liblttng-ctl.sym causes link failures with LLD:
-
-  ld.lld: error: version script assignment of 'global' to symbol
-  'lttng_index_allocator_alloc' failed: symbol not defined
-  ...
-
-Remove these entries from the version script to align the exported ABI
-with the actual symbols provided by liblttng-ctl.
-
-This fixes builds with clang + lld.
-
-Upstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/15156]
-Change-Id: I27f40f3d38af7014cf5356230e06aa291c9a3c5f
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/lib/lttng-ctl/liblttng-ctl.sym | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/lib/lttng-ctl/liblttng-ctl.sym b/src/lib/lttng-ctl/liblttng-ctl.sym
-index 27900ca44..641084750 100644
---- a/src/lib/lttng-ctl/liblttng-ctl.sym
-+++ b/src/lib/lttng-ctl/liblttng-ctl.sym
-@@ -336,11 +336,6 @@ lttng_health_state
- lttng_health_thread_name
- lttng_health_thread_state
- lttng_ht_seed
--lttng_index_allocator_alloc
--lttng_index_allocator_create
--lttng_index_allocator_destroy
--lttng_index_allocator_get_index_count
--lttng_index_allocator_release
- lttng_kernel_probe_location_address_create
- lttng_kernel_probe_location_address_get_address
- lttng_kernel_probe_location_destroy
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
index 0547f30c02..8f16eb6381 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
@@ -1,4 +1,4 @@ 
-From a45157a50e14d4bd244a3dd05d79c5703c819550 Mon Sep 17 00:00:00 2001
+From aeea0973485fd289f61e95d3022c0f9749d3c4bd Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 12 Dec 2019 16:52:07 +0100
 Subject: [PATCH] tests: do not strip a helper library
diff --git a/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch b/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch
index d32cf87535..5f90d40e85 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch
@@ -1,4 +1,4 @@ 
-From 05cf8ed6cc42a2f6ff53009d0ae2713fe63f1245 Mon Sep 17 00:00:00 2001
+From b8d92575b93d35b223bbe3e3bbcf62f8f90bcc75 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Tue, 14 Dec 2021 12:34:04 +0000
 Subject: [PATCH] lttng-tools: Disable problem tests
@@ -18,7 +18,7 @@  Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  1 file changed, 12 deletions(-)
 
 diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
-index 7076488..e5be904 100644
+index a97028b..2f18d95 100644
 --- a/tests/regression/Makefile.am
 +++ b/tests/regression/Makefile.am
 @@ -40,18 +40,6 @@ SERIAL_TESTS = tools/base-path/test_ust \
diff --git a/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch b/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch
index 5b9a07fcb8..5ed5d8a028 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch
@@ -1,15 +1,23 @@ 
+From 3ed838c388dbac9d267530da6f734452cd01db84 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 19 Aug 2025 10:09:07 +0100
+Subject: [PATCH] lttng-tools: Disable slow tests to fix ptest runs
+
 These tests take too long to run for our default output timeout in ptest-runner (450s).
 We could change that to 900s but it is a global setting so skip these tests for
 now. Ideally tests.serial would have occasional output when running to show activity.
 
 Upstream-Status: Inappropriate [workaround for slow tests]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ tests/regression/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
 
-Index: lttng-tools-2.14.0/tests/regression/Makefile.am
-===================================================================
---- lttng-tools-2.14.0.orig/tests/regression/Makefile.am
-+++ lttng-tools-2.14.0/tests/regression/Makefile.am
-@@ -26,7 +26,6 @@ SERIAL_TESTS = tools/base-path/test_ust
+diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
+index 2f18d95..6650d46 100644
+--- a/tests/regression/Makefile.am
++++ b/tests/regression/Makefile.am
+@@ -26,7 +26,6 @@ SERIAL_TESTS = tools/base-path/test_ust \
  	tools/tracefile-limits/test_tracefile_count \
  	tools/tracefile-limits/test_tracefile_size \
  	tools/exclusion/test_exclusion \
@@ -17,7 +25,7 @@  Index: lttng-tools-2.14.0/tests/regression/Makefile.am
  	tools/snapshots/test_ust_fast \
  	tools/snapshots/test_ust_streaming \
  	tools/snapshots/test_kernel_streaming \
-@@ -47,8 +46,6 @@ SERIAL_TESTS = tools/base-path/test_ust
+@@ -47,8 +46,6 @@ SERIAL_TESTS = tools/base-path/test_ust \
  	tools/rotation/test_schedule_api \
  	tools/metadata/test_kernel \
  	tools/working-directory/test_relayd_working_directory \
diff --git a/meta/recipes-kernel/lttng/lttng-tools/libc++.patch b/meta/recipes-kernel/lttng/lttng-tools/libc++.patch
index be793c7699..437b509c9b 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/libc++.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/libc++.patch
@@ -1,4 +1,11 @@ 
-sessiond: avoid std::vector range-ctor on non-standard iterators (libc++)
+From 08c7856c2ce3cd76f8c42b146703ae37b728489d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 20 Aug 2025 23:45:20 -0700
+Subject: [PATCH] sessiond: avoid std::vector range-ctor on non-standard
+ iterators (libc++)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 libc++ SFINAE-gates std::vector(It, It) behind standard iterator requirements.
 The events_view/channels_ht_view iterators don’t model Input/Forward, so the
@@ -9,12 +16,16 @@  libstdc++ behavior unchanged.
 
 Upstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/15163]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/bin/lttng-sessiond/ust-registry-channel.cpp | 7 +++++--
+ src/bin/lttng-sessiond/ust-registry-session.cpp | 7 +++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
 
-Index: lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-channel.cpp
-===================================================================
---- lttng-tools-2.14.0.orig/src/bin/lttng-sessiond/ust-registry-channel.cpp
-+++ lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-channel.cpp
-@@ -529,8 +529,11 @@ void lsu::registry_channel::_accept_on_e
+diff --git a/src/bin/lttng-sessiond/ust-registry-channel.cpp b/src/bin/lttng-sessiond/ust-registry-channel.cpp
+index 45be2cc..01d5db3 100644
+--- a/src/bin/lttng-sessiond/ust-registry-channel.cpp
++++ b/src/bin/lttng-sessiond/ust-registry-channel.cpp
+@@ -529,8 +529,11 @@ void lsu::registry_channel::_accept_on_event_classes(
  		events_view(*_events->ht);
  
  	/* Copy the event ptrs from the _events ht to this vector which we'll sort. */
@@ -28,11 +39,11 @@  Index: lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-channel.cpp
  
  	std::sort(sorted_event_classes.begin(),
  		  sorted_event_classes.end(),
-Index: lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-session.cpp
-===================================================================
---- lttng-tools-2.14.0.orig/src/bin/lttng-sessiond/ust-registry-session.cpp
-+++ lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-session.cpp
-@@ -586,8 +586,11 @@ void lsu::registry_session::_accept_on_s
+diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp
+index fbb6f02..ff4f63a 100644
+--- a/src/bin/lttng-sessiond/ust-registry-session.cpp
++++ b/src/bin/lttng-sessiond/ust-registry-session.cpp
+@@ -586,8 +586,11 @@ void lsu::registry_session::_accept_on_stream_classes(lst::trace_class_visitor&
  						  decltype(lsu::registry_channel::_node),
  						  &lsu::registry_channel::_node>
  		channels_ht_view(*_channels->ht);
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb
similarity index 96%
rename from meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb
index 7ab99cf2c6..c160c4886a 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb
@@ -49,14 +49,11 @@  SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://run-ptest \
            file://lttng-sessiond.service \
            file://disable-tests.patch \
-           file://0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch \
-           file://0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch \
            file://disable-tests2.patch \
-           file://0001-liblttng-ctl-drop-index-allocator-symbols-from-versi.patch \
            file://libc++.patch \
            "
 
-SRC_URI[sha256sum] = "d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3"
+SRC_URI[sha256sum] = "0e68eb27923621c4bc127cfce40422d28cf7e473fedf6229ae6c32ba5c5b7c6d"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd