diff mbox series

[7/7] lttng-ust: upgrade 2.13.9 -> 2.14.0

Message ID 20250701232440.474-7-wangmy@fujitsu.com
State New
Headers show
Series [1/7] gst-examples: upgrade 1.26.2 -> 1.26.3 | expand

Commit Message

Wang Mingyu July 1, 2025, 11:24 p.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

0001-lttng-ust-common-link-with-liburcu-explicitly.patch
0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
refreshed for 2.14.0

License-Update: add suffix ".txt" to according files.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...0001-lttng-ust-common-link-with-liburcu-explicitly.patch | 6 +++---
 ...thon-lttngust-Makefile.am-Add-install-lib-to-setup.patch | 6 +++---
 .../lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb}      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb} (92%)

Comments

Antonin Godard July 2, 2025, 7:20 a.m. UTC | #1
On Wed Jul 2, 2025 at 1:24 AM CEST, wangmy via lists.openembedded.org wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-lttng-ust-common-link-with-liburcu-explicitly.patch
> 0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
> refreshed for 2.14.0
>
> License-Update: add suffix ".txt" to according files.
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...0001-lttng-ust-common-link-with-liburcu-explicitly.patch | 6 +++---
>  ...thon-lttngust-Makefile.am-Add-install-lib-to-setup.patch | 6 +++---
>  .../lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb}      | 4 ++--
>  3 files changed, 8 insertions(+), 8 deletions(-)
>  rename meta/recipes-kernel/lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb} (92%)
>
> 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 ceb240680b..b72c453b96 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 1b6bbf14de8fdfe60e446c93969e29bc2cf5f2dc Mon Sep 17 00:00:00 2001
> +From 4cdaf17efc66423aec5e3c094b9a1c31683e1a10 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex@linutronix.de>
>  Date: Sun, 5 Sep 2021 10:44:19 +0200
>  Subject: [PATCH] lttng-ust-common: link with liburcu explicitly
> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>   1 file changed, 1 insertion(+)
>  
>  diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am
> -index 1ccc290..6531fa0 100644
> +index c350edc..09212a7 100644
>  --- a/src/lib/lttng-ust-common/Makefile.am
>  +++ b/src/lib/lttng-ust-common/Makefile.am
> -@@ -16,6 +16,7 @@ liblttng_ust_common_la_SOURCES = \
> +@@ -18,6 +18,7 @@ liblttng_ust_common_la_SOURCES = \
>   
>   liblttng_ust_common_la_LIBADD = \
>   	$(top_builddir)/src/common/libcommon.la \
> 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 7bbe5c216e..faddf55402 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 30660997d220602202d8dc7264e49095a1581947 Mon Sep 17 00:00:00 2001
> +From 92fd7a205aff290a6f20c08e62f72094100c3689 Mon Sep 17 00:00:00 2001
>  From: Richard Purdie <richard.purdie@linuxfoundation.org>
>  Date: Tue, 20 Feb 2024 12:19:06 +0000
>  Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
> @@ -14,10 +14,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am
> -index d53e21d..283901e 100644
> +index 30db9fb..d46b6ee 100644
>  --- a/src/python-lttngust/Makefile.am
>  +++ b/src/python-lttngust/Makefile.am
> -@@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp
> +@@ -47,7 +47,7 @@ install-exec-local: build-python-bindings.stamp
>   	if [ "$(DESTDIR)" != "" ]; then \
>   		opts="$$opts --root=$(DESTDIR)"; \
>   	fi; \
> diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb b/meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
> 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 dd7657e0cc..1a15c5b420 100644
> --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb
> +++ b/meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
> @@ -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"
>  
Hi,

This is causing the following issue on the Autobuilder:
| ../../../../sources/lttng-tools-2.13.15/src/bin/lttng-sessiond/ust-app.c:6802:23: error: too few arguments to function 'lttng_ust_ctl_recv_register_event'; expected 10, have 9
|  6802 |                 ret = lttng_ust_ctl_recv_register_event(sock, &sobjd, &cobjd, name,
|       |                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| In file included from ../../../../sources/lttng-tools-2.13.15/src/bin/lttng-sessiond/lttng-ust-ctl.h:12,
|                  from ../../../../sources/lttng-tools-2.13.15/src/bin/lttng-sessiond/buffer-registry.h:18,
|                  from ../../../../sources/lttng-tools-2.13.15/src/bin/lttng-sessiond/ust-app.c:37:
| /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/lttng/ust-ctl.h:549:5: note: declared here
|   549 | int lttng_ust_ctl_recv_register_event(int sock,
|       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1928

Can you have a look?

Antonin
Alexander Kanavin July 2, 2025, 7:33 a.m. UTC | #2
This does not address the feedback given to the first version of the
patch. You need to update all three lttng recipes in lockstep.

Alex

On Wed, 2 Jul 2025 at 01:24, wangmy via lists.openembedded.org
<wangmy=fujitsu.com@lists.openembedded.org> wrote:
>
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-lttng-ust-common-link-with-liburcu-explicitly.patch
> 0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
> refreshed for 2.14.0
>
> License-Update: add suffix ".txt" to according files.
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...0001-lttng-ust-common-link-with-liburcu-explicitly.patch | 6 +++---
>  ...thon-lttngust-Makefile.am-Add-install-lib-to-setup.patch | 6 +++---
>  .../lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb}      | 4 ++--
>  3 files changed, 8 insertions(+), 8 deletions(-)
>  rename meta/recipes-kernel/lttng/{lttng-ust_2.13.9.bb => lttng-ust_2.14.0.bb} (92%)
>
> 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 ceb240680b..b72c453b96 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 1b6bbf14de8fdfe60e446c93969e29bc2cf5f2dc Mon Sep 17 00:00:00 2001
> +From 4cdaf17efc66423aec5e3c094b9a1c31683e1a10 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex@linutronix.de>
>  Date: Sun, 5 Sep 2021 10:44:19 +0200
>  Subject: [PATCH] lttng-ust-common: link with liburcu explicitly
> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>   1 file changed, 1 insertion(+)
>
>  diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am
> -index 1ccc290..6531fa0 100644
> +index c350edc..09212a7 100644
>  --- a/src/lib/lttng-ust-common/Makefile.am
>  +++ b/src/lib/lttng-ust-common/Makefile.am
> -@@ -16,6 +16,7 @@ liblttng_ust_common_la_SOURCES = \
> +@@ -18,6 +18,7 @@ liblttng_ust_common_la_SOURCES = \
>
>   liblttng_ust_common_la_LIBADD = \
>         $(top_builddir)/src/common/libcommon.la \
> 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 7bbe5c216e..faddf55402 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 30660997d220602202d8dc7264e49095a1581947 Mon Sep 17 00:00:00 2001
> +From 92fd7a205aff290a6f20c08e62f72094100c3689 Mon Sep 17 00:00:00 2001
>  From: Richard Purdie <richard.purdie@linuxfoundation.org>
>  Date: Tue, 20 Feb 2024 12:19:06 +0000
>  Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
> @@ -14,10 +14,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am
> -index d53e21d..283901e 100644
> +index 30db9fb..d46b6ee 100644
>  --- a/src/python-lttngust/Makefile.am
>  +++ b/src/python-lttngust/Makefile.am
> -@@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp
> +@@ -47,7 +47,7 @@ install-exec-local: build-python-bindings.stamp
>         if [ "$(DESTDIR)" != "" ]; then \
>                 opts="$$opts --root=$(DESTDIR)"; \
>         fi; \
> diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb b/meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
> 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 dd7657e0cc..1a15c5b420 100644
> --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb
> +++ b/meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
> @@ -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"
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#219741): https://lists.openembedded.org/g/openembedded-core/message/219741
> Mute This Topic: https://lists.openembedded.org/mt/113939347/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 ceb240680b..b72c453b96 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 1b6bbf14de8fdfe60e446c93969e29bc2cf5f2dc Mon Sep 17 00:00:00 2001
+From 4cdaf17efc66423aec5e3c094b9a1c31683e1a10 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sun, 5 Sep 2021 10:44:19 +0200
 Subject: [PATCH] lttng-ust-common: link with liburcu explicitly
@@ -12,10 +12,10 @@  Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 1 insertion(+)
 
 diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am
-index 1ccc290..6531fa0 100644
+index c350edc..09212a7 100644
 --- a/src/lib/lttng-ust-common/Makefile.am
 +++ b/src/lib/lttng-ust-common/Makefile.am
-@@ -16,6 +16,7 @@ liblttng_ust_common_la_SOURCES = \
+@@ -18,6 +18,7 @@ liblttng_ust_common_la_SOURCES = \
  
  liblttng_ust_common_la_LIBADD = \
  	$(top_builddir)/src/common/libcommon.la \
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 7bbe5c216e..faddf55402 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 30660997d220602202d8dc7264e49095a1581947 Mon Sep 17 00:00:00 2001
+From 92fd7a205aff290a6f20c08e62f72094100c3689 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Tue, 20 Feb 2024 12:19:06 +0000
 Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
@@ -14,10 +14,10 @@  Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am
-index d53e21d..283901e 100644
+index 30db9fb..d46b6ee 100644
 --- a/src/python-lttngust/Makefile.am
 +++ b/src/python-lttngust/Makefile.am
-@@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp
+@@ -47,7 +47,7 @@ install-exec-local: build-python-bindings.stamp
  	if [ "$(DESTDIR)" != "" ]; then \
  		opts="$$opts --root=$(DESTDIR)"; \
  	fi; \
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb b/meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
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 dd7657e0cc..1a15c5b420 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.13.9.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb
@@ -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"