lttng-tools: upgrade 2.14.1 -> 2.15.0
PATCH 1/1 lttng-tools: upgrade 2.14.1 -> 2.15.0
From: Wang Mingyu <[email protected]>
disable-tests2.patch
refresshed for 2.15.0
0001-tests-do-not-strip-a-helper-library.patch
removed since it's not available in 2.15.0
---
...-tests-do-not-strip-a-helper-library.patch | 24 -------------------
.../lttng/lttng-tools/disable-tests2.patch | 22 ++++++++++-------
...-tools_2.14.1.bb => lttng-tools_2.15.0.bb} | 10 ++++----
3 files changed, 19 insertions(+), 37 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
rename meta/recipes-kernel/lttng/{lttng-tools_2.14.1.bb => lttng-tools_2.15.0.bb} (96%)meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch deleted +0 -24
@@ -1,24 +0,0 @@ -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 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -index 836f13e..e19a554 100644 ---- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -+++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -@@ -14,7 +14,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la - libfoo.strip: libfoo.la - $(OBJCOPY) --strip-all .libs/libfoo.so - --all-local: libfoo.strip -+all-local: - @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for script in $(EXTRA_DIST); do \ - cp -f $(srcdir)/$$script $(builddir); \
meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch +14 -8
@@ -5,24 +5,30 @@ now. Ideally tests.serial would have occasional output when running to show acti Upstream-Status: Inappropriate [workaround for slow tests] Signed-off-by: Richard Purdie <[email protected]> -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 +--- + tests/regression/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am +index a7cd133..bd82e94 100644 +--- a/tests/regression/Makefile.am ++++ b/tests/regression/Makefile.am +@@ -30,7 +30,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ tools/exclusion/test_exclusion \ - tools/snapshots/test_kernel \ tools/snapshots/test_ust_fast \ + tools/snapshots/test_ust_long \ tools/snapshots/test_ust_streaming \ - tools/snapshots/test_kernel_streaming \ -@@ -47,8 +46,6 @@ SERIAL_TESTS = tools/base-path/test_ust +@@ -53,7 +52,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/rotation/test_schedule_api \ tools/metadata/test_kernel \ tools/working-directory/test_relayd_working_directory \ -- tools/clear/test_ust \ - tools/clear/test_kernel \ tools/clear/test_live_hang.py \ tools/tracker/test_event_tracker \ tools/trigger/start-stop/test_start_stop \ +-- +2.43.0 +
meta/recipes-kernel/lttng/lttng-tools_2.15.0.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb +5 -5
@@ -44,7 +44,6 @@ PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod" PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ - file://0001-tests-do-not-strip-a-helper-library.patch \ file://run-ptest \ file://lttng-sessiond.service \ file://disable-tests.patch \
@@ -52,7 +51,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://libc++.patch \ " -SRC_URI[sha256sum] = "0e68eb27923621c4bc127cfce40422d28cf7e473fedf6229ae6c32ba5c5b7c6d" +SRC_URI[sha256sum] = "4d739116556da71d58275bc7f0a6c0a967c6774b7d90f02c2731a7875debf28a" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
@@ -76,6 +75,7 @@ FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" # Python module needs to keep _lttng.so INSANE_SKIP:${PN} = "libexec dev-so" INSANE_SKIP:${PN}-dbg = "libexec" +INSANE_SKIP:${PN} = "already-stripped" PRIVATE_LIBS:${PN}-ptest = "libfoo.so"
@@ -95,7 +95,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/session.xsd src/common/mi-lttng-4.1.xsd \ + for f in tests/utils/tap-driver.sh config/test-driver src/common/session.xsd src/common/mi-lttng-4.2.xsd \ tests/regression/tests.serial; do install -D "${S}/$f" "${D}${PTEST_PATH}/$f" done
@@ -140,8 +140,8 @@ do_install_ptest () { done done - chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary - chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
Signature · 1 line
2.43.0
Quoted 10 lines · wangmy via lists.openembedded.org
From: Wang Mingyu <[email protected]>
disable-tests2.patch
refresshed for 2.15.00001-tests-do-not-strip-a-helper-library.patch
removed since it's not available in 2.15.0Signed-off-by Wang Mingyu <[email protected]>---
Hi Wang,
Thanks for the upgrade.
We also have musl build issues here:
ERROR: lttng-tools-2.15.0-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/lttng-tools/2.15.0/temp/run.do_compile.3424918' failed with exit code 1
...
| In file included from /srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/lttng-tools/2.15.0/recipe-sysroot/usr/include/fcntl.h:22, | from /srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/lttng-tools/2.15.0/recipe-sysroot/usr/include/sys/epoll.h:11, | from ../../../sources/lttng-tools-2.15.0/src/common/poller.hpp:19, | from ../../../sources/lttng-tools-2.15.0/src/common/poller.cpp:8: | ../../../sources/lttng-tools-2.15.0/src/common/poller.cpp: In lambda function: | ../../../sources/lttng-tools-2.15.0/src/common/poller.cpp:61:57: error: expected id-expression before numeric constant | 61 | const auto epoll_fd = ::epoll_create1(::EPOLL_CLOEXEC); | | ^~~~~~~~~~~~~ | In file included from /srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/lttng-tools/2.15.0/recipe-sysroot/usr/include/fcntl.h:22, | from /srv/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/x86-64-v3-poky-linux-musl/lttng-tools/2.15.0/recipe-sysroot/usr/include/sys/timerfd.h:9, | from ../../../sources/lttng-tools-2.15.0/src/common/timerfd.hpp:14, | from ../../../sources/lttng-tools-2.15.0/src/common/timerfd.cpp:10: | ../../../sources/lttng-tools-2.15.0/src/common/timerfd.hpp:22:40: error: expected id-expression before numeric constant | 22 | explicit timerfd(int flags = ::TFD_CLOEXEC); | | ^~~~~~~~~~~ | At global scope: | cc1plus: note: unrecognized command-line option '-Wno-gnu-folding-constant' may have been intended to silence earlier diagnostics | cc1plus: note: unrecognized command-line option '-Wno-incomplete-setjmp-declaration' may have been intended to silence earlier diagnostics | cc1plus: note: unrecognized command-line option '-Wno-gnu-folding-constant' may have been intended to silence earlier diagnostics | cc1plus: note: unrecognized command-line option '-Wno-incomplete-setjmp-declaration' may have been intended to silence earlier diagnostics
https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/3496
https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/3463
https://autobuilder.yoctoproject.org/valkyrie/#/builders/111/builds/2174
Also, I believe we have some reproducibility error:
AssertionError: The following deb packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/lttng-tools-ptest_2.15.0-r0_amd64.deb The following ipk packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./x86-64-v3/lttng-tools-ptest_2.15.0-r0_x86-64-v3.ipk The following rpm packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./x86_64_v3/lttng-tools-ptest-2.15.0-r0.x86_64_v3.rpm
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3670
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260324-9c_hk1xz/packages/diff-html/
Can you have a look at the issue?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com