From: Mingli Yu Date: Thu, 5 Feb 2026 08:51:19 +0000 (+0800) Subject: lttng-tools: Upgrade 2.14.0 -> 2.14.1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b55e191fb598d9bad25ba774e7d6a82f446c3d9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git lttng-tools: Upgrade 2.14.0 -> 2.14.1 Remove 0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch as the logic is included in 2.14.1 [1]. Remove 0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch as the logic is included in 2.14.1 [2]. Remove 0001-liblttng-ctl-drop-index-allocator-symbols-from-versi.patch as the logic is included in 2.14.1 [3]. util_event_generator.sh is renamed to util_event_generator.py [4] and the .py install logic in included as below. find "${B}/tests/$d" -maxdepth 1 -type f -name "*.py" \ -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + # ./run-ptest [snip] PASS: test_ust_data 8 - Validate UST event PASS: test_ust_data 9 - Create UST context PASS: test_ust_data 10 - Validate UST context PASS: test_ust_data 11 - Validate string length PASS: test_ust_data 12 - Create UST exclusion PASS: test_ust_data 13 - Create UST event with identical exclusion names fails PASS: test_ust_data 14 - Create UST exclusion PASS: test_ust_data 15 - Create UST event with different exclusion names PASS: test_ust_data 16 - Validate UST event and exclusion ============================================================================ Testsuite summary for lttng-tools 2.14.1 ============================================================================ # TOTAL: 1089 # PASS: 1089 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 [1] https://github.com/lttng/lttng-tools/commit/409ea456e181a769fc7e4b0a44823be0bdc8b9ce [2] https://github.com/lttng/lttng-tools/commit/e58aac43fc498e48eb0bfb871dd5b50e54a5e93e [3] https://github.com/lttng/lttng-tools/commit/e7eaad663489f8a12568f8ca84429b6ed64dc8c5 [4] https://github.com/lttng/lttng-tools/commit/7126bceecea9ed5d981863400ee7c4ba13042871 Signed-off-by: Mingli Yu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 02bd1d1db02..00000000000 --- 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 -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 ---- - 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 562381b5fd9..00000000000 --- 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 -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 - -Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/171] - -Signed-off-by: Mingli Yu ---- - 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 3a535470dae..00000000000 --- 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 -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 ---- - 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_2.14.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb similarity index 95% 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 7ab99cf2c69..46bf59c2716 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 @@ -93,7 +90,6 @@ do_install_ptest () { for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng \ tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh \ tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh \ - tests/regression/tools/notification/util_event_generator.sh \ tests/regression/tools/trace-format/ust-local-trace-pretty.expect \ tests/regression/tools/trace-format/kernel-local-trace-pretty.expect \ tests/regression/tools/base-path/*.lttng; do