From patchwork Tue Apr 15 13:32:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 61339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A599C369B5 for ; Tue, 15 Apr 2025 13:32:54 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web11.20163.1744723971422604722 for ; Tue, 15 Apr 2025 06:32:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=Zzwzjx8v; dkim=pass header.i=@amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=crDEvvhp; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101019639a709e2-98a946dc-7b62-42fb-b63f-b3976fdc888c-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1744723970; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=f2ve+uvpyLpdf1Li411upn7oKHclsStvj04Y/WkQPPg=; b=Zzwzjx8vi0yNUxBNVWjDgXP5vWwdcVJ5YOPT8UgEbHNtMbMWIpnwi7eN4FtV5OC2 WApFg6fRcZs7Tgi1bsmn04i12CUro0ZAu4fT0t69s04IA+ZDB81AykHQ2mLn3xYAFWZ 4ZHVZ4HJOf5kB9w4bRBs6EzpoiN2qoIC/204HeeY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1744723970; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=f2ve+uvpyLpdf1Li411upn7oKHclsStvj04Y/WkQPPg=; b=crDEvvhpY0KJx7gQGo5PJy4hZe5V8MQvKs7iYQHlyButN7wprkX+gTDQtEVlHFfL osjvR/O51jV/cxZrUQCNrAGfMH2G8r/bwieTYWqBRl+nqHiYel3sHruXLHwjjpEdcjj q+rwtN/gCSkI+V5KKRtMPNrfgfriDLK1ojRyT08c= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie , Richard Purdie , Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] lttng-tools,lttng-modules,lttng-ust: upgrading to 2.13.15,2.13.18,2.13.9 SUCCEEDED Message-ID: <0101019639a709e2-98a946dc-7b62-42fb-b63f-b3976fdc888c-000000@us-west-2.amazonses.com> Date: Tue, 15 Apr 2025 13:32:50 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.04.15-54.240.27.193 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Apr 2025 13:32:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214860 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *lttng-tools,lttng-modules,lttng-ust* to *2.13.15,2.13.18,2.13.9* has Succeeded. Next steps: - apply the patch: git am 0001-lttng-tools-lttng-modules-lttng-ust-upgrade-2.13.14-.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 b4401268f61652b3eb27f208d89a08fb2347132c Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Tue, 15 Apr 2025 06:24:43 +0000 Subject: [PATCH] lttng-tools,lttng-modules,lttng-ust: upgrade 2.13.14 -> 2.13.15,2.13.17 -> 2.13.18,2.13.8 -> 2.13.9 --- ...e-missing-CONFIG_TRACEPOINTS-to-warn.patch | 2 +- ...es_2.13.17.bb => lttng-modules_2.13.18.bb} | 2 +- ...troy-flush-fix-session-daemon-abort-.patch | 7 +- ...pat-Define-off64_t-as-off_t-on-linux.patch | 17 +- ...skip_kernel_test-to-check-root-user-.patch | 105 ++++++------ ...-tests-do-not-strip-a-helper-library.patch | 2 +- .../lttng/lttng-tools/disable-tests.patch | 16 +- ...ools_2.13.14.bb => lttng-tools_2.13.15.bb} | 2 +- ...es-when-rpath-is-stripped-from-in-bu.patch | 161 ------------------ ...-common-link-with-liburcu-explicitly.patch | 3 +- ...Makefile.am-Add-install-lib-to-setup.patch | 3 +- ...ttng-ust_2.13.8.bb => lttng-ust_2.13.9.bb} | 3 +- 12 files changed, 86 insertions(+), 237 deletions(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.13.17.bb => lttng-modules_2.13.18.bb} (94%) rename meta/recipes-kernel/lttng/{lttng-tools_2.13.14.bb => lttng-tools_2.13.15.bb} (99%) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch rename meta/recipes-kernel/lttng/{lttng-ust_2.13.8.bb => lttng-ust_2.13.9.bb} (92%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch index 4911982461..11aeb1200e 100644 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch @@ -1,4 +1,4 @@ -From 60d423945bd4f4c4b7bfc6f29da9231152d05690 Mon Sep 17 00:00:00 2001 +From f8a3f717129ddd1e5541167170f70f45ff45bcfa Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 15 May 2021 10:26:38 -0400 Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.17.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb similarity index 94% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.17.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb index 0657112c14..553dae9f4d 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.17.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb @@ -16,7 +16,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ " -SRC_URI[sha256sum] = "b0b23504150ae5c1fc6ee14e28d029518f61fe2ec5f17bb61c7941aa52bb6e65" +SRC_URI[sha256sum] = "a2f38e289817dbd1d2f12cfc1f20390230e16d56323cb58cc1db9874ced400ed" export INSTALL_MOD_DIR = "kernel/lttng-modules" diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch index 8ddc588354..fbf01ad6d7 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch @@ -1,4 +1,4 @@ -From 6b45c5f80d20e7bbf3d98c1fa17d2cf8716af3bb Mon Sep 17 00:00:00 2001 +From 0a03a0d062bbbbada7ae56f84c2ea0396065e88d Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Mon, 25 Mar 2024 18:20:14 +0800 Subject: [PATCH] Fix: rotation-destroy-flush: fix session daemon abort if no @@ -33,7 +33,7 @@ Signed-off-by: Xiangyu Chen 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 669bcbc43..64161768f 100755 +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 @@ -51,6 +51,3 @@ index 669bcbc43..64161768f 100755 # MUST set TESTDIR before calling those functions function run_app() { --- -2.25.1 - diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch index 25caccdef8..bb3476991a 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch @@ -1,7 +1,11 @@ -From 74b3844737b03492756b4f896c938b504b069f14 Mon Sep 17 00:00:00 2001 -From: Jérémie Galarneau +From 68b844680043c90607b0fc04258ec28ff0a3e18a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= + Date: Tue, 17 Jan 2023 16:57:35 -0500 Subject: [PATCH] compat: off64_t is not defined by musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit This helps compile with latest musl, where off64_t is not defined unless _LARGEFILE64_SOURCE is defined. On glibc, _LARGEFILE64_SOURCE is defined @@ -20,7 +24,12 @@ Reported-by: Khem Raj Signed-off-by: Jérémie Galarneau Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 --- + src/common/compat/compat-fcntl.c | 5 ++++- + src/common/compat/fcntl.h | 10 +++------- + 2 files changed, 7 insertions(+), 8 deletions(-) +diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c +index 5c0bdc9..18bab0a 100644 --- a/src/common/compat/compat-fcntl.c +++ b/src/common/compat/compat-fcntl.c @@ -8,14 +8,17 @@ @@ -42,6 +51,8 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 #ifdef HAVE_SYNC_FILE_RANGE return sync_file_range(fd, offset, nbytes, flags); #else +diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h +index 5e566e5..93b22b7 100644 --- a/src/common/compat/fcntl.h +++ b/src/common/compat/fcntl.h @@ -13,16 +13,12 @@ @@ -62,7 +73,7 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 unsigned int flags); #define lttng_sync_file_range(fd, offset, nbytes, flags) \ compat_sync_file_range(fd, offset, nbytes, flags) -@@ -37,8 +33,8 @@ extern int compat_sync_file_range(int fd +@@ -37,8 +33,8 @@ extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, #define SYNC_FILE_RANGE_WAIT_BEFORE 0 #define SYNC_FILE_RANGE_WRITE 0 diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch index 2671a1908e..8808bc5de5 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch @@ -1,4 +1,4 @@ -From cf558f802b259a33605fe0ede4d74ae2ff6be699 Mon Sep 17 00:00:00 2001 +From 2ffa5c261800ad885c2d2fbe15a79ba7b835354a Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Mon, 12 Feb 2024 09:23:54 -0500 Subject: [PATCH] tests: add check_skip_kernel_test to check root user and @@ -83,7 +83,7 @@ Signed-off-by: Jérémie Galarneau 47 files changed, 166 insertions(+), 363 deletions(-) diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration -index b81e7af32..36b130d17 100755 +index b81e7af..36b130d 100755 --- a/tests/destructive/metadata-regeneration +++ b/tests/destructive/metadata-regeneration @@ -185,19 +185,13 @@ function test_ust_streaming () @@ -108,7 +108,7 @@ index b81e7af32..36b130d17 100755 start_lttng_relayd "-o $TRACE_PATH" start_lttng_sessiond diff --git a/tests/perf/test_perf_raw.in b/tests/perf/test_perf_raw.in -index f293ccd71..d35529a87 100644 +index f293ccd..d35529a 100644 --- a/tests/perf/test_perf_raw.in +++ b/tests/perf/test_perf_raw.in @@ -137,12 +137,6 @@ function test_kernel_raw() @@ -134,7 +134,7 @@ index f293ccd71..d35529a87 100644 modprobe lttng-test test_kernel_raw diff --git a/tests/regression/kernel/test_all_events b/tests/regression/kernel/test_all_events -index 2e20888df..044f9b65f 100755 +index 2e20888..044f9b6 100755 --- a/tests/regression/kernel/test_all_events +++ b/tests/regression/kernel/test_all_events @@ -43,13 +43,7 @@ plan_tests $NUM_TESTS @@ -153,7 +153,7 @@ index 2e20888df..044f9b65f 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack -index a4477fd7c..d8d6b5e0f 100755 +index a4477fd..d8d6b5e 100755 --- a/tests/regression/kernel/test_callstack +++ b/tests/regression/kernel/test_callstack @@ -134,13 +134,7 @@ plan_tests $NUM_TESTS @@ -172,7 +172,7 @@ index a4477fd7c..d8d6b5e0f 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/kernel/test_channel b/tests/regression/kernel/test_channel -index 9cc74c4e8..4c377bd2a 100755 +index 9cc74c4..4c377bd 100755 --- a/tests/regression/kernel/test_channel +++ b/tests/regression/kernel/test_channel @@ -47,13 +47,7 @@ function test_channel_buffer_too_large() @@ -191,7 +191,7 @@ index 9cc74c4e8..4c377bd2a 100755 start_lttng_sessiond diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override -index 72892898b..48a3f926a 100755 +index 7289289..48a3f92 100755 --- a/tests/regression/kernel/test_clock_override +++ b/tests/regression/kernel/test_clock_override @@ -172,13 +172,7 @@ TESTS=( @@ -210,7 +210,7 @@ index 72892898b..48a3f926a 100755 validate_lttng_modules_present trap signal_cleanup SIGTERM SIGINT diff --git a/tests/regression/kernel/test_event_basic b/tests/regression/kernel/test_event_basic -index ac9ec0549..387e2f733 100755 +index ac9ec05..387e2f7 100755 --- a/tests/regression/kernel/test_event_basic +++ b/tests/regression/kernel/test_event_basic @@ -73,13 +73,7 @@ plan_tests $NUM_TESTS @@ -229,7 +229,7 @@ index ac9ec0549..387e2f733 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/kernel/test_kernel_function b/tests/regression/kernel/test_kernel_function -index b1d5491fc..ea16cdeef 100755 +index b1d5491..ea16cde 100755 --- a/tests/regression/kernel/test_kernel_function +++ b/tests/regression/kernel/test_kernel_function @@ -43,13 +43,7 @@ plan_tests $NUM_TESTS @@ -248,7 +248,7 @@ index b1d5491fc..ea16cdeef 100755 start_lttng_sessiond_notap validate_lttng_modules_present diff --git a/tests/regression/kernel/test_lttng_logger b/tests/regression/kernel/test_lttng_logger -index b8f7ded82..00eaae823 100755 +index b8f7ded..00eaae8 100755 --- a/tests/regression/kernel/test_lttng_logger +++ b/tests/regression/kernel/test_lttng_logger @@ -110,13 +110,7 @@ plan_tests $NUM_TESTS @@ -267,7 +267,7 @@ index b8f7ded82..00eaae823 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/kernel/test_ns_contexts b/tests/regression/kernel/test_ns_contexts -index 0c8718d78..59e2568f6 100755 +index 7d447bc..1c71ea5 100755 --- a/tests/regression/kernel/test_ns_contexts +++ b/tests/regression/kernel/test_ns_contexts @@ -108,13 +108,7 @@ plan_tests $NUM_TESTS @@ -286,7 +286,7 @@ index 0c8718d78..59e2568f6 100755 system_has_ns=0 if [ -d "/proc/$$/ns" ]; then diff --git a/tests/regression/kernel/test_ns_contexts_change b/tests/regression/kernel/test_ns_contexts_change -index 42a61276b..3f5e4eeab 100755 +index 42a6127..3f5e4ee 100755 --- a/tests/regression/kernel/test_ns_contexts_change +++ b/tests/regression/kernel/test_ns_contexts_change @@ -162,14 +162,7 @@ plan_tests $NUM_TESTS @@ -306,7 +306,7 @@ index 42a61276b..3f5e4eeab 100755 system_has_ns=0 if [ -d "/proc/$$/ns" ]; then diff --git a/tests/regression/kernel/test_rotation_destroy_flush b/tests/regression/kernel/test_rotation_destroy_flush -index cb773d7df..0af514b49 100755 +index cb773d7..0af514b 100755 --- a/tests/regression/kernel/test_rotation_destroy_flush +++ b/tests/regression/kernel/test_rotation_destroy_flush @@ -120,13 +120,7 @@ TESTS=( @@ -325,7 +325,7 @@ index cb773d7df..0af514b49 100755 validate_lttng_modules_present trap signal_cleanup SIGTERM SIGINT diff --git a/tests/regression/kernel/test_select_poll_epoll b/tests/regression/kernel/test_select_poll_epoll -index d8245a0e7..20f0ef0ae 100755 +index d8245a0..20f0ef0 100755 --- a/tests/regression/kernel/test_select_poll_epoll +++ b/tests/regression/kernel/test_select_poll_epoll @@ -374,13 +374,7 @@ if test $? != 0; then @@ -344,7 +344,7 @@ index d8245a0e7..20f0ef0ae 100755 validate_lttng_modules_present diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall -index 401a18a8d..219d94703 100755 +index 401a18a..219d947 100755 --- a/tests/regression/kernel/test_syscall +++ b/tests/regression/kernel/test_syscall @@ -664,13 +664,7 @@ plan_tests $NUM_TESTS @@ -363,7 +363,7 @@ index 401a18a8d..219d94703 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/kernel/test_userspace_probe b/tests/regression/kernel/test_userspace_probe -index 1091ee65e..5d984d666 100755 +index 1091ee6..5d984d6 100755 --- a/tests/regression/kernel/test_userspace_probe +++ b/tests/regression/kernel/test_userspace_probe @@ -815,13 +815,7 @@ fi @@ -382,7 +382,7 @@ index 1091ee65e..5d984d666 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/tools/clear/test_kernel b/tests/regression/tools/clear/test_kernel -index 06fb1c368..48250a742 100755 +index 06fb1c3..48250a7 100755 --- a/tests/regression/tools/clear/test_kernel +++ b/tests/regression/tools/clear/test_kernel @@ -536,12 +536,6 @@ plan_tests $NUM_TESTS @@ -408,7 +408,7 @@ index 06fb1c368..48250a742 100755 trap signal_cleanup SIGTERM SIGINT diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter -index 7d9e524d9..8435e5546 100755 +index 7d9e524..8435e55 100755 --- a/tests/regression/tools/filtering/test_invalid_filter +++ b/tests/regression/tools/filtering/test_invalid_filter @@ -168,13 +168,7 @@ done @@ -427,7 +427,7 @@ index 7d9e524d9..8435e5546 100755 diag "Test kernel filters" i=0 diff --git a/tests/regression/tools/filtering/test_unsupported_op b/tests/regression/tools/filtering/test_unsupported_op -index 299247a3c..91eb86d21 100755 +index 299247a..91eb86d 100755 --- a/tests/regression/tools/filtering/test_unsupported_op +++ b/tests/regression/tools/filtering/test_unsupported_op @@ -103,13 +103,7 @@ while [ "$i" -lt "$OP_COUNT" ]; do @@ -446,7 +446,7 @@ index 299247a3c..91eb86d21 100755 diag "Test kernel unsupported filter operations" diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter -index e76ffa25f..1ba7c79bb 100755 +index e76ffa2..1ba7c79 100755 --- a/tests/regression/tools/filtering/test_valid_filter +++ b/tests/regression/tools/filtering/test_valid_filter @@ -1452,13 +1452,7 @@ KERNEL_FILTERS=( @@ -465,7 +465,7 @@ index e76ffa25f..1ba7c79bb 100755 diag "Test kernel valid filters" diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh -index b3d6419d2..68716e6b9 100644 +index b3d6419..68716e6 100644 --- a/tests/regression/tools/health/test_health.sh +++ b/tests/regression/tools/health/test_health.sh @@ -82,7 +82,7 @@ function test_health @@ -500,7 +500,7 @@ index b3d6419d2..68716e6b9 100644 i=0 while [ "$i" -lt "$THREAD_COUNT" ]; do diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok -index e84adb611..e5e23543f 100755 +index e84adb6..e5e2354 100755 --- a/tests/regression/tools/health/test_thread_ok +++ b/tests/regression/tools/health/test_thread_ok @@ -67,7 +67,7 @@ function test_thread_ok @@ -527,7 +527,7 @@ index e84adb611..e5e23543f 100755 rm -rf ${HEALTH_PATH} diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel -index b622b5214..fdaa09f0d 100755 +index b622b52..fdaa09f 100755 --- a/tests/regression/tools/live/test_kernel +++ b/tests/regression/tools/live/test_kernel @@ -39,13 +39,11 @@ function clean_live_tracing() @@ -549,7 +549,7 @@ index b622b5214..fdaa09f0d 100755 modprobe lttng-test diff --git a/tests/regression/tools/live/test_lttng_kernel b/tests/regression/tools/live/test_lttng_kernel -index a23d9373a..1b933648f 100755 +index a23d937..1b93364 100755 --- a/tests/regression/tools/live/test_lttng_kernel +++ b/tests/regression/tools/live/test_lttng_kernel @@ -45,13 +45,7 @@ function clean_live_tracing() @@ -568,7 +568,7 @@ index a23d9373a..1b933648f 100755 modprobe lttng-test diff --git a/tests/regression/tools/metadata/test_kernel b/tests/regression/tools/metadata/test_kernel -index 57cace6ea..26e95d93a 100755 +index 57cace6..26e95d9 100755 --- a/tests/regression/tools/metadata/test_kernel +++ b/tests/regression/tools/metadata/test_kernel @@ -91,13 +91,7 @@ plan_tests $NUM_TESTS @@ -587,7 +587,7 @@ index 57cace6ea..26e95d93a 100755 validate_lttng_modules_present modprobe lttng-test diff --git a/tests/regression/tools/notification/test_notification_kernel_buffer_usage b/tests/regression/tools/notification/test_notification_kernel_buffer_usage -index 76e69a77e..8fdaabb3e 100755 +index 76e69a7..8fdaabb 100755 --- a/tests/regression/tools/notification/test_notification_kernel_buffer_usage +++ b/tests/regression/tools/notification/test_notification_kernel_buffer_usage @@ -60,29 +60,27 @@ function test_buffer_usage_notification @@ -638,7 +638,7 @@ index 76e69a77e..8fdaabb3e 100755 +rm -rf "${consumerd_pipe[@]}" 2> /dev/null rm -rf "$TEST_TMPDIR" diff --git a/tests/regression/tools/notification/test_notification_kernel_capture b/tests/regression/tools/notification/test_notification_kernel_capture -index 88f123d3d..0f8a2bc6f 100755 +index 88f123d..0f8a2bc 100755 --- a/tests/regression/tools/notification/test_notification_kernel_capture +++ b/tests/regression/tools/notification/test_notification_kernel_capture @@ -31,22 +31,21 @@ function test_basic_error_path @@ -676,7 +676,7 @@ index 88f123d3d..0f8a2bc6f 100755 rm -f "$TESTAPP_STATE_PATH" diff --git a/tests/regression/tools/notification/test_notification_kernel_error b/tests/regression/tools/notification/test_notification_kernel_error -index 80fe6e5b5..b757ec2b4 100755 +index 80fe6e5..b757ec2 100755 --- a/tests/regression/tools/notification/test_notification_kernel_error +++ b/tests/regression/tools/notification/test_notification_kernel_error @@ -30,23 +30,22 @@ function test_basic_error_path @@ -715,7 +715,7 @@ index 80fe6e5b5..b757ec2b4 100755 rm -f "$TESTAPP_STATE_PATH" diff --git a/tests/regression/tools/notification/test_notification_kernel_instrumentation b/tests/regression/tools/notification/test_notification_kernel_instrumentation -index 90545a541..705f7703d 100755 +index 90545a5..705f770 100755 --- a/tests/regression/tools/notification/test_notification_kernel_instrumentation +++ b/tests/regression/tools/notification/test_notification_kernel_instrumentation @@ -28,22 +28,21 @@ function test_kernel_instrumentation_notification @@ -753,7 +753,7 @@ index 90545a541..705f7703d 100755 rm -f "$TESTAPP_STATE_PATH" diff --git a/tests/regression/tools/notification/test_notification_kernel_syscall b/tests/regression/tools/notification/test_notification_kernel_syscall -index d273cb55d..7fa235388 100755 +index d273cb5..7fa2353 100755 --- a/tests/regression/tools/notification/test_notification_kernel_syscall +++ b/tests/regression/tools/notification/test_notification_kernel_syscall @@ -31,19 +31,18 @@ function test_kernel_syscall_notification @@ -786,7 +786,7 @@ index d273cb55d..7fa235388 100755 rm -f "$TESTAPP_STATE_PATH" diff --git a/tests/regression/tools/notification/test_notification_kernel_userspace_probe b/tests/regression/tools/notification/test_notification_kernel_userspace_probe -index 8ef8d708d..abddd9be7 100755 +index 8ef8d70..abddd9b 100755 --- a/tests/regression/tools/notification/test_notification_kernel_userspace_probe +++ b/tests/regression/tools/notification/test_notification_kernel_userspace_probe @@ -29,18 +29,18 @@ function test_kernel_userspace_probe_notification @@ -819,7 +819,7 @@ index 8ef8d708d..abddd9be7 100755 rm -f "$TESTAPP_STATE_PATH" diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app -index d8b639225..61891b56f 100755 +index d8b6392..61891b5 100755 --- a/tests/regression/tools/notification/test_notification_multi_app +++ b/tests/regression/tools/notification/test_notification_multi_app @@ -411,22 +411,18 @@ function test_on_register_evaluation () @@ -851,10 +851,10 @@ index d8b639225..61891b56f 100755 for fct_test in ${TESTS[@]}; do diff --git a/tests/regression/tools/notification/test_notification_notifier_discarded_count b/tests/regression/tools/notification/test_notification_notifier_discarded_count -index c9235393e..a6c31a728 100755 +index 9850b49..778d37d 100755 --- a/tests/regression/tools/notification/test_notification_notifier_discarded_count +++ b/tests/regression/tools/notification/test_notification_notifier_discarded_count -@@ -391,7 +391,8 @@ function test_ust_notifier_discarded_regardless_trigger_owner +@@ -376,7 +376,8 @@ function test_ust_notifier_discarded_regardless_trigger_owner test_ust_notifier_discarded_count test_ust_notifier_discarded_count_max_bucket @@ -864,7 +864,7 @@ index c9235393e..a6c31a728 100755 validate_lttng_modules_present -@@ -413,9 +414,7 @@ if [ "$(id -u)" == "0" ]; then +@@ -398,9 +399,7 @@ if [ "$(id -u)" == "0" ]; then modprobe --remove lttng-test rm -rf "${sessiond_pipe[@]}" 2> /dev/null @@ -877,7 +877,7 @@ index c9235393e..a6c31a728 100755 rm -rf "$TEST_TMPDIR" diff --git a/tests/regression/tools/regen-metadata/test_kernel b/tests/regression/tools/regen-metadata/test_kernel -index 49eea32a7..555a4e2ce 100755 +index 49eea32..555a4e2 100755 --- a/tests/regression/tools/regen-metadata/test_kernel +++ b/tests/regression/tools/regen-metadata/test_kernel @@ -99,13 +99,7 @@ plan_tests $NUM_TESTS @@ -896,7 +896,7 @@ index 49eea32a7..555a4e2ce 100755 validate_lttng_modules_present diff --git a/tests/regression/tools/regen-statedump/test_kernel b/tests/regression/tools/regen-statedump/test_kernel -index 8a261355d..bbbac3942 100755 +index 8a26135..bbbac39 100755 --- a/tests/regression/tools/regen-statedump/test_kernel +++ b/tests/regression/tools/regen-statedump/test_kernel @@ -39,13 +39,7 @@ plan_tests $NUM_TESTS @@ -915,7 +915,7 @@ index 8a261355d..bbbac3942 100755 validate_lttng_modules_present start_lttng_sessiond diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel -index f5f1f5553..efe3fd359 100755 +index f5f1f55..efe3fd3 100755 --- a/tests/regression/tools/rotation/test_kernel +++ b/tests/regression/tools/rotation/test_kernel @@ -82,13 +82,7 @@ plan_tests $NUM_TESTS @@ -934,7 +934,7 @@ index f5f1f5553..efe3fd359 100755 validate_lttng_modules_present diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel -index abb243563..d91876867 100755 +index abb2435..d918768 100755 --- a/tests/regression/tools/snapshots/test_kernel +++ b/tests/regression/tools/snapshots/test_kernel @@ -217,13 +217,7 @@ plan_tests $NUM_TESTS @@ -953,7 +953,7 @@ index abb243563..d91876867 100755 validate_lttng_modules_present diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming -index 0c92dc710..dd965afee 100755 +index 0c92dc7..dd965af 100755 --- a/tests/regression/tools/snapshots/test_kernel_streaming +++ b/tests/regression/tools/snapshots/test_kernel_streaming @@ -145,13 +145,7 @@ plan_tests $NUM_TESTS @@ -972,7 +972,7 @@ index 0c92dc710..dd965afee 100755 validate_lttng_modules_present diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits -index 2b9e3ad39..c55d51098 100755 +index 2b9e3ad..c55d510 100755 --- a/tests/regression/tools/streaming/test_high_throughput_limits +++ b/tests/regression/tools/streaming/test_high_throughput_limits @@ -170,13 +170,7 @@ plan_tests $NUM_TESTS @@ -991,7 +991,7 @@ index 2b9e3ad39..c55d51098 100755 # Catch sigint and try to cleanup limits diff --git a/tests/regression/tools/streaming/test_kernel b/tests/regression/tools/streaming/test_kernel -index 33334229f..113eea7bf 100755 +index 3333422..113eea7 100755 --- a/tests/regression/tools/streaming/test_kernel +++ b/tests/regression/tools/streaming/test_kernel @@ -47,13 +47,7 @@ plan_tests $NUM_TESTS @@ -1010,7 +1010,7 @@ index 33334229f..113eea7bf 100755 validate_lttng_modules_present diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker -index cc0f698d2..de0c79d36 100755 +index cc0f698..de0c79d 100755 --- a/tests/regression/tools/tracker/test_event_tracker +++ b/tests/regression/tools/tracker/test_event_tracker @@ -466,13 +466,7 @@ test_event_track_untrack ust 0 "${EVENT_NAME}" "--pid --all" # backward compat @@ -1029,7 +1029,7 @@ index cc0f698d2..de0c79d36 100755 diag "Test kernel tracker" diff --git a/tests/regression/tools/trigger/test_add_trigger_cli b/tests/regression/tools/trigger/test_add_trigger_cli -index 98ecf6272..d1763aa2e 100755 +index 98ecf62..d1763aa 100755 --- a/tests/regression/tools/trigger/test_add_trigger_cli +++ b/tests/regression/tools/trigger/test_add_trigger_cli @@ -34,12 +34,6 @@ tmp_stdout=$(mktemp --tmpdir -t test_parse_cli_trigger_stdout.XXXXXX) @@ -1073,7 +1073,7 @@ index 98ecf6272..d1763aa2e 100755 --name="syscall-trigger-0" \ --condition event-rule-matches --type=syscall --name=open \ diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli -index a04018013..02c3de3e9 100755 +index 2574e15..652a08c 100755 --- a/tests/regression/tools/trigger/test_list_triggers_cli +++ b/tests/regression/tools/trigger/test_list_triggers_cli @@ -36,22 +36,12 @@ uprobe_sdt_binary=$(realpath "${TESTDIR}/utils/testapp/userspace-probe-sdt-binar @@ -1120,7 +1120,7 @@ index a04018013..02c3de3e9 100755 test_buffer_usage_conditions test_session_rotation_conditions diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard -index f69baffc4..14d9bb88a 100755 +index f69baff..14d9bb8 100755 --- a/tests/regression/tools/wildcard/test_event_wildcard +++ b/tests/regression/tools/wildcard/test_event_wildcard @@ -124,13 +124,7 @@ test_event_wildcard ust 1 'tp*tptest' @@ -1139,7 +1139,7 @@ index f69baffc4..14d9bb88a 100755 diag "Test kernel wildcards" diff --git a/tests/regression/tools/working-directory/test_relayd_working_directory b/tests/regression/tools/working-directory/test_relayd_working_directory -index c7e784cca..6bd1e504a 100755 +index c7e784c..6bd1e50 100755 --- a/tests/regression/tools/working-directory/test_relayd_working_directory +++ b/tests/regression/tools/working-directory/test_relayd_working_directory @@ -145,9 +145,9 @@ function test_relayd_debug_permission() @@ -1155,7 +1155,7 @@ index c7e784cca..6bd1e504a 100755 skip $is_user "Skipping permission debug output test; operation can't fail as root" 6 || diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change -index 8a4b62ce3..622241f7b 100755 +index 8a4b62c..622241f 100755 --- a/tests/regression/ust/namespaces/test_ns_contexts_change +++ b/tests/regression/ust/namespaces/test_ns_contexts_change @@ -101,12 +101,7 @@ plan_tests $NUM_TESTS @@ -1173,7 +1173,7 @@ index 8a4b62ce3..622241f7b 100755 system_has_ns=0 if [ -d "/proc/$$/ns" ]; then diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf -index 33aab2981..178959a19 100755 +index 33aab29..178959a 100755 --- a/tests/regression/ust/test_event_perf +++ b/tests/regression/ust/test_event_perf @@ -119,17 +119,11 @@ plan_tests $NUM_TESTS @@ -1196,10 +1196,10 @@ index 33aab2981..178959a19 100755 test_event_basic } diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh -index faa87e783..da0e0569d 100644 +index 35633fa..b6783ef 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh -@@ -318,6 +318,41 @@ function conf_proc_count() +@@ -329,6 +329,41 @@ function conf_proc_count() echo } @@ -1241,6 +1241,3 @@ index faa87e783..da0e0569d 100644 # Check if base lttng-modules are present. # Bail out on failure function validate_lttng_modules_present () --- -2.25.1 - 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 2f95889c4b..51b137d6cb 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 2237748af00467ad8250a7ccd944200f811db69a Mon Sep 17 00:00:00 2001 +From 581c283101ea7ee10af9be283bc9cfc63c6bab0c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 3a77ea2e43..0d5ab60ac1 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch @@ -1,3 +1,8 @@ +From 3f2b374332091928532729cde4057e781059273d Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 14 Dec 2021 12:34:04 +0000 +Subject: [PATCH] lttng-tools: Disable problem tests + Upstream-Status: Inappropriate [need to root cause the test hangs] We keep seeing hangs in the tools/notifications tests on x86 and arm for @@ -8,11 +13,14 @@ of them. https://bugzilla.yoctoproject.org/show_bug.cgi?id=14263 Signed-off-by: Richard Purdie +--- + tests/regression/Makefile.am | 12 ------------ + 1 file changed, 12 deletions(-) -Index: lttng-tools-2.13.1/tests/regression/Makefile.am -=================================================================== ---- lttng-tools-2.13.1.orig/tests/regression/Makefile.am -+++ lttng-tools-2.13.1/tests/regression/Makefile.am +diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am +index e556223..756fb98 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 \ tools/regen-metadata/test_ust \ diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.14.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb similarity index 99% rename from meta/recipes-kernel/lttng/lttng-tools_2.13.14.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb index 98c2f9831b..762d4e5c2f 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.14.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb @@ -41,7 +41,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch \ " -SRC_URI[sha256sum] = "53bdf7c4ad07dbfe660ee4d9affc63fe44ae59e9a73c6f7a96e0fca140e5adcb" +SRC_URI[sha256sum] = "96ea42351ee112c19dad9fdc7aae93b583d9f1722b2175664a381d2d337703c4" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch deleted file mode 100644 index 6da675fa31..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 5d10459b6b5182fcbc98240d9dace026c87a5037 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 5 Aug 2024 15:41:34 -0400 -Subject: [PATCH] Fix: Build examples when rpath is stripped from in-build-tree - libs - -Observed issue -============== - -Certain tool chains[1, 2] emit warnings or errors when building the -example applications. - -``` -make[3]: Entering directory -'/home/xxx/src/efficios/lttng/master/src/lttng-ust/doc/examples/easy-ust' -CC sample.o -CC tp.o -CCLD sample - -/usr/bin/ld: warning: liblttng-ust-common.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) -/usr/bin/ld: warning: liblttng-ust-tracepoint.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_add_fd_to_tracker' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_child' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_common_ctor' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_init' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_register_queue_release' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_cancelstate_disable_pop' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_synchronize_rcu' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_register_thread' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_prune_release_queue' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_cancelstate_disable_push' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_before_fork' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_lock_fd_tracker' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_trace_clock' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_has_sys_membarrier' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_unlock_fd_tracker' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_exit' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_get_cpu_sym' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_common_alloc_tls' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_parent' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_delete_fd_from_tracker' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_register' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_reader' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_gp' -/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_unregister_queue_release' -collect2: error: ld returned 1 exit status -``` - -=== Reproducer === - -The easiest way to consistently reproduce this type of build failure -is to perform the following steps: - -``` -./configure -make -j$(nproc) -find . -iname '*.so' -exec chrpath -d {} \; -make -C doc/examples clean -make -j$(nproc) -``` - -As the examples are not built with libtool, finding the libraries to -link against depends on the shared objects having an rpath. - -E.g. - -``` -$ chrpath src/lib/lttng-ust/.libs/liblttng-ust.so.1.0.0 -src/lib/lttng-ust/.libs/liblttng-ust.so.1.0.0: RUNPATH=/home/xxx/src/efficios/lttng/master/src/lttng-ust/src/lib/lttng-ust-common/.libs:/home/xxx/src/efficios/lttng/master/src/lttng-ust/src/lib/lttng-ust-tracepoint/.libs:/home/xxx/src/efficios/lttng/master/usr/lib -``` - -The current examples build with `-Wl,-rpath` for `liblttng-ust`, but -not the dependencies of `liblttng-ust` (which would normally be found -via it's own rpath). If the `rpath` is stripped from -`liblttng-ust.so`, or if the tool chain ignores `rpath` explicitly, -then the build with fail. - -In the case of a yocto build environment as in GitHub#61[1], the -following commands reproduced the warnings and the errors seen in the -above test case. - -``` -git clone git://git.yoctoproject.org/poky && cd poky/ -. oe-init-build-env -echo "PACKAGECONFIG:pn-lttng-ust = 'examples'" >>conf/local.conf -bitbake lttng-ust -``` - -=== Solution === - -Explicitly add library search paths and set linker rpath-link are set -for both the standard and cmake examples. Similar changes were -proposed for each of those parts respectively in GitHub#61[1] and GitHub#63[2]. - -=== Known issues === - -While the `rpath-link` for the second order library dependencies will -allow the builds to complete, the examples will not work at -runtime even when using `rpath`. From `man ld.so`, the rpaths in an -executable or shared object are only considered for direct -dependencies. Therefore, without setting `LD_LIBRARY_PATH` or -installing the libraries test applications will fail as follows: - -``` -$ ./doc/examples/easy-ust/sample -./doc/examples/easy-ust/sample: error while loading shared libraries: liblttng-ust-common.so.1: cannot open shared object file: No such file or directory -``` - -References -========== - -[1]: https://github.com/lttng/lttng-ust/pull/61 -[2]: https://github.com/lttng/lttng-ust/pull/63 - -Change-Id: I273ccddd0d0b7a1b57b9e09ddf48d8b5b41e6f8e -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers - -Upstream-Status: Backport [https://github.com/lttng/lttng-ust/commit/5d10459b6b5182fcbc98240d9dace026c87a5037] -Signed-off-by: Bin Lan - ---- - doc/examples/Makefile.am | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am -index aebf63bd..79766ec0 100644 ---- a/doc/examples/Makefile.am -+++ b/doc/examples/Makefile.am -@@ -169,7 +169,10 @@ all-local: - CFLAGS='$(CFLAGS)' \ - AM_CFLAGS='$(AM_CFLAGS)' \ - LDFLAGS="$(LDFLAGS)" \ -- AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \ -+ AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -L../../../src/lib/lttng-ust-common/.libs -L../../../src/lib/lttng-ust-tracepoint/.libs \ -+ -Wl,-rpath="$(abs_top_builddir)/src/lib/lttng-ust/.libs/" \ -+ -Wl,-rpath-link="$(abs_top_builddir)/src/lib/lttng-ust-common/.libs/" \ -+ -Wl,-rpath-link="$(abs_top_builddir)/src/lib/lttng-ust-tracepoint/.libs/"' \ - LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ - AM_V_P="$(AM_V_P)" \ - AM_V_at="$(AM_V_at)" \ -@@ -222,10 +225,14 @@ all-local: - CXX="$(CXX)" \ - $(CMAKE) \ - -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ -- -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs" \ -+ -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs;$(abs_top_builddir)/src/lib/lttng-ust-common/.libs;$(abs_top_builddir)/src/lib/lttng-ust-tracepoint/.libs" \ - -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ -- -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \ -+ -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS) \ -+ -L../../../src/lib/lttng-ust/.libs -L../../../src/lib/lttng-ust-common/.libs -L../../../src/lib/lttng-ust-tracepoint/.libs \ -+ -Wl,-rpath=$(abs_top_builddir)/src/lib/lttng-ust/.libs/ \ -+ -Wl,-rpath-link=$(abs_top_builddir)/src/lib/lttng-ust-common/.libs/ \ -+ -Wl,-rpath-link=$(abs_top_builddir)/src/lib/lttng-ust-tracepoint/.libs/" \ - .. && \ - $(MAKE) \ - ) || exit 1; \ --- -2.43.0 - diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch index e85dbdb439..c1d5713db5 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch @@ -1,4 +1,4 @@ -From 27402453f25fbdb5a9fb1a1b88d1c4d9852187d2 Mon Sep 17 00:00:00 2001 +From 7e697a3992f33fadfbc7b909108dda4cb69e9e84 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 5 Sep 2021 10:44:19 +0200 Subject: [PATCH] lttng-ust-common: link with liburcu explicitly @@ -7,7 +7,6 @@ Otherwise linking errors are seen on x86-32. Upstream-Status: Submitted [by email to lttng-dev, Francis, Jonathan] Signed-off-by: Alexander Kanavin - --- src/lib/lttng-ust-common/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch index 7c49583e0d..874865689a 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch @@ -1,4 +1,4 @@ -From f65efd963e52de51d35e2e03fb773f33dd64f565 Mon Sep 17 00:00:00 2001 +From b97591d8f70ab3fc34d0efc45b594eab9f7b1415 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Feb 2024 12:19:06 +0000 Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py @@ -9,7 +9,6 @@ building. Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59] Signed-off-by: Robert Yang - --- src/python-lttngust/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb similarity index 92% rename from meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb rename to meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb index bf2524bdc0..dd7657e0cc 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb @@ -31,10 +31,9 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ file://0001-lttng-ust-common-link-with-liburcu-explicitly.patch \ - file://0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch \ " -SRC_URI[sha256sum] = "d4ef98dab9a37ad4f524ccafdfd50af4f266039b528dd5afabce78e49024d937" +SRC_URI[sha256sum] = "2ad6d69a54a1d924c18a4aa7a233db104e3cc332bcdd240e196bf7adbed3f712" CVE_PRODUCT = "ust"