lttng-ust: Upgrade 2.13.9 -> 2.14.0
PATCH v3 1/4 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
@@ -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
PATCH v3 2/4 babeltrace2: Enable python plugins
From: Mingli Yu <[email protected]>
* The lttng-tools test fails as below as it needs bt2 module.
ERROR: ust/high-throughput/test_high_throughput_snapshot.py
===========================================================
Traceback (most recent call last):
File "/usr/lib/lttng-tools/ptest/tests/regression/./ust/high-throughput/test_high_throughput_snapshot.py", line 26, in <module>
import bt2
ModuleNotFoundError: No module named 'bt2'
Enable python plugins for babeltrace2 to provide the above support.
* Add swig-native to DEPENDS to fix the below configure error.
| configure: error: SWIG 2.0.0 or newer is required to build the python bindings
* There are some ptest failed cases after enable python plugins and track the failed ptest as https://bugs.lttng.org/issues/1430.
--- meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb +3 -3
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & BSD-4-Clause & GPL-3.0-or-later & CC-BY-SA-4.0 & PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f6b015e4f388d6e78adb1b1f9a887d06" -DEPENDS = "glib-2.0 util-linux popt bison-native flex-native virtual/libiconv" +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native virtual/libiconv swig-native" SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=https;tag=v${PV} \ file://run-ptest \
@@ -19,13 +19,13 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" inherit autotools pkgconfig ptest python3targetconfig -EXTRA_OECONF = "--disable-debug-info --disable-Werror" +EXTRA_OECONF = "--disable-debug-info --disable-Werror --enable-python-plugins --enable-python-bindings" PACKAGECONFIG ??= "manpages" PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" -FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" +FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so ${PYTHON_SITEPACKAGES_DIR}/*" ASNEEDED = "" LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld=bfd ', '', d)}"
Signature · 1 line
2.34.1
Re: [OE-core] [PATCH v3 2/4] babeltrace2: Enable python plugins
Quoted 13 lines · Mingli via lists.openembedded.org Yu
From: Mingli Yu <[email protected]>
* The lttng-tools test fails as below as it needs bt2 module.
ERROR:ust/high-throughput/test_high_throughput_snapshot.py
===========================================================Traceback (most recent call last):
File "/usr/lib/lttng-tools/ptest/tests/regression/./ust/high-throughput/test_high_throughput_snapshot.py", line 26, in <module>
import bt2
ModuleNotFoundError: No module named 'bt2'Enable python plugins for babeltrace2 to provide the above support.
Quoted 8 lines
* Add swig-native to DEPENDS to fix the below configure error.
| configure: error: SWIG 2.0.0 or newer is required to build the python bindings* There are some ptest failed cases after enable python plugins and track the failed ptest as https://bugs.lttng.org/issues/1430.
Signed-off-by Mingli Yu <[email protected]>---
Hi Mingli,
I know you are working on the issue, just to confirm we still get the same ptest failures:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1968
https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/1952
Best regards,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH v3 2/4] babeltrace2: Enable python plugins
In reply to [email protected]Quoted 13 lines · Mingli via lists.openembedded.org Yu
From: Mingli Yu <[email protected]>
* The lttng-tools test fails as below as it needs bt2 module.
ERROR:ust/high-throughput/test_high_throughput_snapshot.py
===========================================================Traceback (most recent call last):
File "/usr/lib/lttng-tools/ptest/tests/regression/./ust/high-throughput/test_high_throughput_snapshot.py", line 26, in <module>
import bt2
ModuleNotFoundError: No module named 'bt2'Enable python plugins for babeltrace2 to provide the above support.
Quoted 8 lines
* Add swig-native to DEPENDS to fix the below configure error.
| configure: error: SWIG 2.0.0 or newer is required to build the python bindings* There are some ptest failed cases after enable python plugins and track the failed ptest as https://bugs.lttng.org/issues/1430.
Signed-off-by Mingli Yu <[email protected]>---
Sorry, forgot some errors: we also have packaging issues at build time:
ERROR: babeltrace2-2.1.1-r0 do_package: QA Issue: babeltrace2: Files/directories were installed but not shipped in any package:
/usr/lib/python3.13/site-packages/bt2-2.1.1-py3.13.egg-info /usr/lib/python3.13/site-packages/bt2/stream.py
/usr/lib/python3.13/site-packages/bt2/field_location.py
/usr/lib/python3.13/site-packages/bt2/graph.py
/usr/lib/python3.13/site-packages/bt2/py_plugin.py
/usr/lib/python3.13/site-packages/bt2/clock_class.py
/usr/lib/python3.13/site-packages/bt2/event.py
/usr/lib/python3.13/site-packages/bt2/message.py
/usr/lib/python3.13/site-packages/bt2/local_typing.py
...
https://autobuilder.yoctoproject.org/valkyrie/#/builders/59/builds/2088
https://autobuilder.yoctoproject.org/valkyrie/#/builders/92/builds/2089
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 3/4 lttng-tools: Upgrade 2.13.15 -> 2.14.0
In reply to [email protected]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 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]
* Add the redpends for lttng-tools-ptest to fix the test failure.
ERROR: tools/live/test_early_inactive_app.py
============================================
Traceback (most recent call last):
File "/usr/lib/lttng-tools/ptest/tests/regression/./tools/live/test_early_inactive_app.py", line 21, in <module>
import lttngtest
File "/usr/lib/lttng-tools/ptest/tests/utils/lttngtest/__init__.py", line 9, in <module>
from .environment import *
File "/usr/lib/lttng-tools/ptest/tests/utils/lttngtest/environment.py", line 13, in <module>
import random
ModuleNotFoundError: No module named 'random'
ERROR: tools/live/test_early_inactive_app.py - missing test plan
ModuleNotFoundError: No module named 'random'
ModuleNotFoundError: No module named 'xml'
ModuleNotFoundError: No module named 'tempfile'
ModuleNotFoundError: No module named 'json'
ModuleNotFoundError: No module named 'bt2'
[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 +-
.../lttng/lttng-tools/run-ptest | 2 +-
...tools_2.13.15.bb => lttng-tools_2.14.0.bb} | 23 +-
9 files changed, 65 insertions(+), 1452 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} (92%)meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch deleted +0 -53
@@ -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
@@ -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
@@ -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/run-ptest +1 -1
@@ -20,7 +20,7 @@ function validate_lttng_modules_present() return 1 } -export LD_LIBRARY_PATH=FIXMEPTESTPATH/tests/utils/testapp/userspace-probe-elf-binary/.libs +export LD_LIBRARY_PATH=FIXMEPTESTPATH/tests/utils/testapp/userspace-probe-elf-binary/.libs:FIXMEPTESTPATH/tests/utils/testapp/gen-ust-events-constructor/.libs makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=FIXMEPTESTPATH top_builddir=FIXMEPTESTPATH" #If current system doesn't have lttng kernel modules, disable lttng kernel related tests.
meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb +15 -8
@@ -12,14 +12,23 @@ 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" RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils" # babelstats.pl wants getopt-long -RDEPENDS:${PN}-ptest += "perl-module-getopt-long" +RDEPENDS:${PN}-ptest += "perl-module-getopt-long \ + babeltrace2 \ + python3-logging \ + python3-math \ + python3-numbers \ + python3-json \ + python3-io \ + python3-shell \ + python3-xml \ +" PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
@@ -36,13 +45,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 +90,8 @@ 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 \ + tests/regression/tests.serial; do install -D "${S}/$f" "${D}${PTEST_PATH}/$f" done
Signature · 1 line
2.34.1
PATCH v3 4/4 lttng-tools: Remove the scope resolution operator
In reply to [email protected]From: Mingli Yu <[email protected]>
Remove the scope resolution operator :: to fix the below build failure.
| ../../../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; | |
--- ...Remove-the-scope-resolution-operator.patch | 41 +++++++++++++++++++ .../lttng/lttng-tools_2.14.0.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch
meta/recipes-kernel/lttng/lttng-tools/0001-eventfd.cpp-Remove-the-scope-resolution-operator.patch new file +41 -0
@@ -0,0 +1,41 @@ +From da83d31a8dd555c28eb27bd7a7d3c53b51d5f276 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb +1 -0
@@ -46,6 +46,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ 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 \ " SRC_URI[sha256sum] = "d8c39c26cec13b7bd82551cd52a22efc358b888e36ebcf9c1b60ef1c3a3c2fd3"
Signature · 1 line
2.34.1