Skip to contentSkip to conversation

lttng-ust: Upgrade 2.13.9 -> 2.14.0

PATCH Superseded [email protected] 3 participants 4 messages Jul 17, 2025

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lttng-ust: Upgrade 2.13.9 -> 2.14.0

From: Mingli Yu <[email protected]>

License-Update:
implement REUSE with SPDX identifiers [1]

[1] https://github.com/lttng/lttng-ust/commit/e03d7c66c57bf268b87296566a5160039f35ccfb

---
 .../lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb} (92%)
meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb +2 -2
similarity index 92%
rename from meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
index dd7657e0cc1..1a15c5b4201 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "http://lttng.org/ust"
 BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust"
 
 LICENSE = "LGPL-2.1-or-later & MIT & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a46577a38ad0c36ff6ff43ccf40c480f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b04e8f34dbcf08198c6618d05e8fe7b"
 
 PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
                  am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
@@ -33,7 +33,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
            file://0001-lttng-ust-common-link-with-liburcu-explicitly.patch \
            "
 
-SRC_URI[sha256sum] = "2ad6d69a54a1d924c18a4aa7a233db104e3cc332bcdd240e196bf7adbed3f712"
+SRC_URI[sha256sum] = "82cdfd304bbb2b2b7d17cc951a6756b37a9f73868ec0ba7db448a0d5ca51b763"
 
 CVE_PRODUCT = "ust"
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 lttng-tools: Upgrade 2.13.15 -> 2.14.0

From: Mingli Yu <[email protected]>

Remove 3 backported patch. 0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch 0001-compat-Define-off64_t-as-off_t-on-linux.patch 0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch

Remove 0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch as the the issue has been fixed in another way as [1]

Rebase 0001-tests-do-not-strip-a-helper-library.patch and disable-tests.patch to fuzz issue.

Add babeltrace2 to DEPENDS to fix below configure error.
| configure: error: libbabeltrace2 is required to build tests

src/common/config/session.xsd is restructured to src/common/session.xsd [2]

Add 0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch to fix
the below buildpath QA issue.
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: lttng-tools-ptest: /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-c-constructor-so contains bad RPATH /buildarea3/myu2/yocto/builds/ptest-2025-07-09/tmp/work/core2-64-poky-linux/lttng-tools/2.14.0/build/tests/utils/testapp/gen-ust-events-constructor [rpaths]
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]
ERROR: lttng-tools-2.14.0-r0 do_package_qa: QA Issue: lttng-tools-ptest: /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-constructor-so contains bad RPATH /buildarea3/myu2/yocto/builds/ptest-2025-07-09/tmp/work/core2-64-poky-linux/lttng-tools/2.14.0/build/tests/utils/testapp/gen-ust-events-constructor [rpaths]

[1] https://github.com/lttng/lttng-tools/commit/2d2e77ddc9e3e63c3c658e824fb754f5a534a6ab
[2] https://github.com/lttng/lttng-tools/commit/4ae042345b4094e98611744d9ba6c92265058fdb

---
 ...troy-flush-fix-session-daemon-abort-.patch |   53 -
 ...pat-Define-off64_t-as-off_t-on-linux.patch |   86 --
 ...fails-to-compile-with-libxml2-2.14.0.patch |   55 -
 ...onstructor-change-rpath-to-libdir-li.patch |   43 +
 ...skip_kernel_test-to-check-root-user-.patch | 1243 -----------------
 ...-tests-do-not-strip-a-helper-library.patch |    2 +-
 .../lttng/lttng-tools/disable-tests.patch     |   10 +-
 ...tools_2.13.15.bb => lttng-tools_2.14.0.bb} |   11 +-
 8 files changed, 53 insertions(+), 1450 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch
 create 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-tests-add-check_skip_kernel_test-to-check-root-user-.patch
 rename meta/recipes-kernel/lttng/{lttng-tools_2.13.15.bb => lttng-tools_2.14.0.bb} (94%)
meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch deleted +0 -53
deleted file mode 100644
index e5c96770738..00000000000
@@ -1,53 +0,0 @@
-From ea47622987d0947af3e8f75d16d52e27ebd60166 Mon Sep 17 00:00:00 2001
-From: Xiangyu Chen <[email protected]>
-Date: Mon, 25 Mar 2024 18:20:14 +0800
-Subject: [PATCH] Fix: rotation-destroy-flush: fix session daemon abort if no
- kernel module present
-
-Testing rotation-destroy-flush when no lttng kernel modules present, it would
-be failed with error message:
-
-  Error: Unable to load required module lttng-ring-buffer-client-discard
-  not ok 1 - Start session daemon
-  Failed test 'Start session daemon'
-  not ok 2 - Create session rotation_destroy_flush in -o /tmp/tmp.test_rot ...
-  ...
-
-This because test script that sets the LTTNG_ABORT_ON_ERROR environment
-variable. It's this environment variable that causes the sessiond to handle the
-kernel module loading failure as an abort rather than a warning.
-
-Using "check_skip_kernel_test" to detect whether the kernel module fails to
-load is expected or not. If the failure is expected, the script won't set that
-environment variable any more.
-
-Fixes: 3a174400
-("tests:add check_skip_kernel_test to check root user and lttng kernel modules")
-
-Submitted [https://review.lttng.org/c/lttng-tools/+/12155]
-Upstream-Status: Backport [https://github.com/lttng/lttng-tools/commit/78f5b22de60c114c5c83410015a08bdd212edc0b]
-Change-Id: I371e9ba717613e2940186f710cf3cccd35baed6c
-Signed-off-by: Xiangyu Chen <[email protected]>
----
- .../ust/rotation-destroy-flush/test_rotation_destroy_flush  | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
-index 8ef4f0d..e506b53 100755
---- a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
-+++ b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
-@@ -23,11 +23,11 @@ SIZE_LIMIT=$PAGE_SIZE
- NR_ITER=10
- NUM_TESTS=$((15*$NR_ITER))
- 
--# Ensure the daemons invoke abort on error.
--export LTTNG_ABORT_ON_ERROR=1
--
- source $TESTDIR/utils/utils.sh
- 
-+# Ensure the daemons invoke abort on error.
-+check_skip_kernel_test || export LTTNG_ABORT_ON_ERROR=1
-+
- # MUST set TESTDIR before calling those functions
- function run_app()
- {
meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch deleted +0 -86

86 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-tools/0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch deleted +0 -55

55 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-tools/0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch new file +43 -0

43 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-tools/0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch deleted +0 -1243

1,243 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch +1 -1
index 84c02a02cf5..0547f30c02b 100644
@@ -1,4 +1,4 @@
-From 3f1f1dc868accca37d2f276ed741884698b38538 Mon Sep 17 00:00:00 2001
+From a45157a50e14d4bd244a3dd05d79c5703c819550 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 12 Dec 2019 16:52:07 +0100
 Subject: [PATCH] tests: do not strip a helper library
meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch +5 -5
index b8971a69de8..d32cf875356 100644
@@ -1,4 +1,4 @@
-From 1fbd24512e8fce64b92efa846c301e45a7371ed2 Mon Sep 17 00:00:00 2001
+From 05cf8ed6cc42a2f6ff53009d0ae2713fe63f1245 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Tue, 14 Dec 2021 12:34:04 +0000
 Subject: [PATCH] lttng-tools: Disable problem tests
@@ -18,12 +18,12 @@ Signed-off-by: Richard Purdie <[email protected]>
  1 file changed, 12 deletions(-)
 
 diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
-index e556223..756fb98 100644
+index 7076488..e5be904 100644
 --- a/tests/regression/Makefile.am
 +++ b/tests/regression/Makefile.am
-@@ -29,18 +29,6 @@ TESTS = tools/base-path/test_ust \
- 	tools/crash/test_crash \
+@@ -40,18 +40,6 @@ SERIAL_TESTS = tools/base-path/test_ust \
  	tools/regen-metadata/test_ust \
+ 	tools/regen-statedump/test_kernel \
  	tools/regen-statedump/test_ust \
 -	tools/notification/test_notification_ust_error \
 -	tools/notification/test_notification_ust_buffer_usage \
@@ -39,4 +39,4 @@ index e556223..756fb98 100644
 -	tools/notification/test_notification_multi_app \
  	tools/rotation/test_ust \
  	tools/rotation/test_kernel \
- 	tools/rotation/test_save_load_mi \
+ 	tools/rotation/test_ust_kernel \
meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb +4 -7
similarity index 94%
rename from meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb
index f39404afa0f..ef376b72701 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=40ef17463fbd6f377db3c47b1cbaded8 \
 
 include lttng-platforms.inc
 
-DEPENDS = "liburcu popt libxml2 util-linux bison-native"
+DEPENDS = "liburcu popt libxml2 util-linux bison-native babeltrace2"
 RDEPENDS:${PN} = "libgcc"
 RRECOMMENDS:${PN} += "${LTTNGMODULES}"
 RDEPENDS:${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep binutils"
@@ -36,13 +36,10 @@ 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-compat-Define-off64_t-as-off_t-on-linux.patch \
-           file://0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch \
-           file://0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch \
-           file://0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch \
+           file://0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch \
            "
 
-SRC_URI[sha256sum] = "96ea42351ee112c19dad9fdc7aae93b583d9f1722b2175664a381d2d337703c4"
+SRC_URI[sha256sum] = "d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
 
@@ -84,7 +81,7 @@ do_install_ptest () {
         install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
     done
 
-    for f in tests/utils/tap-driver.sh config/test-driver src/common/config/session.xsd src/common/mi-lttng-4.1.xsd; do
+    for f in tests/utils/tap-driver.sh config/test-driver src/common/session.xsd src/common/mi-lttng-4.1.xsd; do
         install -D "${S}/$f" "${D}${PTEST_PATH}/$f"
     done
 
Signature · 1 line
2.34.1
#2 lore raw

Re: [OE-core] [PATCH 2/2] lttng-tools: Upgrade 2.13.15 -> 2.14.0

Quoted 25 lines · Mingli via lists.openembedded.org Yu

From: Mingli Yu <[email protected]>

Remove 3 backported patch. 0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch 0001-compat-Define-off64_t-as-off_t-on-linux.patch 0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch

Remove 0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch as the the issue has been fixed in another way as [1]

Rebase 0001-tests-do-not-strip-a-helper-library.patch and disable-tests.patch to fuzz issue.

Add babeltrace2 to DEPENDS to fix below configure error.
| configure: error: libbabeltrace2 is required to build tests

src/common/config/session.xsd is restructured to src/common/session.xsd [2]

Add 0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch to fix
the below buildpath QA issue.
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: lttng-tools-ptest: /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-c-constructor-so contains bad RPATH /buildarea3/myu2/yocto/builds/ptest-2025-07-09/tmp/work/core2-64-poky-linux/lttng-tools/2.14.0/build/tests/utils/testapp/gen-ust-events-constructor [rpaths]
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]
ERROR: lttng-tools-2.14.0-r0 do_package_qa: QA Issue: lttng-tools-ptest: /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-constructor-so contains bad RPATH /buildarea3/myu2/yocto/builds/ptest-2025-07-09/tmp/work/core2-64-poky-linux/lttng-tools/2.14.0/build/tests/utils/testapp/gen-ust-events-constructor [rpaths]

Quoted 5 lines

[1] https://github.com/lttng/lttng-tools/commit/2d2e77ddc9e3e63c3c658e824fb754f5a534a6ab
[2] https://github.com/lttng/lttng-tools/commit/4ae042345b4094e98611744d9ba6c92265058fdb

---

Hi Mingli,

Thanks for your patch.

It looks like this is breaking when using musl:

ERROR: lttng-tools-2.14.0-r0 do_compile: oe_runmake failed
...

| ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp: In lambda function:
| ../../../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;
|       |                                    ^~~~~~~~~~~~~

https://autobuilder.yoctoproject.org/valkyrie/#/builders/111/builds/790
https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/2072
https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/2102

Can you have a look at these fails please?

Signature · 3 lines
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

Re: [OE-core] [PATCH 2/2] lttng-tools: Upgrade 2.13.15 -> 2.14.0

Quoted 51 lines · Mathieu Dubois-Briand

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 25 lines · Mingli via lists.openembedded.org Yu

From: Mingli Yu <[email protected]>

Remove 3 backported patch. 0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch 0001-compat-Define-off64_t-as-off_t-on-linux.patch 0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch

Remove 0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch as the the issue has been fixed in another way as [1]

Rebase 0001-tests-do-not-strip-a-helper-library.patch and disable-tests.patch to fuzz issue.

Add babeltrace2 to DEPENDS to fix below configure error.
| configure: error: libbabeltrace2 is required to build tests

src/common/config/session.xsd is restructured to src/common/session.xsd [2]

Add 0001-gen-ust-events-constructor-change-rpath-to-libdir-li.patch to fix
the below buildpath QA issue.
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: lttng-tools-ptest: /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-c-constructor-so contains bad RPATH /buildarea3/myu2/yocto/builds/ptest-2025-07-09/tmp/work/core2-64-poky-linux/lttng-tools/2.14.0/build/tests/utils/testapp/gen-ust-events-constructor [rpaths]
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]
ERROR: lttng-tools-2.14.0-r0 do_package_qa: QA Issue: lttng-tools-ptest: /usr/lib/lttng-tools/ptest/tests/utils/testapp/gen-ust-events-constructor/gen-ust-events-constructor-so contains bad RPATH /buildarea3/myu2/yocto/builds/ptest-2025-07-09/tmp/work/core2-64-poky-linux/lttng-tools/2.14.0/build/tests/utils/testapp/gen-ust-events-constructor [rpaths]

Quoted 5 lines

[1] https://github.com/lttng/lttng-tools/commit/2d2e77ddc9e3e63c3c658e824fb754f5a534a6ab
[2] https://github.com/lttng/lttng-tools/commit/4ae042345b4094e98611744d9ba6c92265058fdb

---

Hi Mingli,

Thanks for your patch.

It looks like this is breaking when using musl:

ERROR: lttng-tools-2.14.0-r0 do_compile: oe_runmake failed
...

| ../../../sources/lttng-tools-2.14.0/src/common/eventfd.cpp: In lambda function:
| ../../../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;
|       |                                    ^~~~~~~~~~~~~
Quoted 5 lines

https://autobuilder.yoctoproject.org/valkyrie/#/builders/111/builds/790
https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/2072
https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/2102

Can you have a look at these fails please?

Okay, I will look into this and send v2 then.

Thanks,
Mingli

Quoted 6 lines

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