From 6f4ca08aa3b907af53a160c5904dbef5979b5759 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Feb 2024 12:22:01 +0000 Subject: lttng-ust: Upgrade 2.13.6 -> 2.13.7 Update one of the patches to account for upstream changes. (From OE-Core rev: e0ec2f9358be0e8b5979e534ae3a266b138cc172) Signed-off-by: Richard Purdie --- .../0001-Makefile.am-update-rpath-link.patch | 12 ++--- ...g-ust-common-link-with-liburcu-explicitly.patch | 7 +-- ...gust-Makefile.am-Add-install-lib-to-setup.patch | 14 +++--- meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb | 53 ---------------------- meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb | 53 ++++++++++++++++++++++ 5 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb create mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch index cbbf1df812..6aca8f85fa 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch @@ -1,4 +1,4 @@ -From 06279f50e924d1d55b43eb3b299f6633ecb1f7a4 Mon Sep 17 00:00:00 2001 +From 7d053804ab3823d40ae10d90f4efc49dbfb4cb66 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 22 Sep 2021 16:33:10 +0800 Subject: [PATCH] Makefile.am: update rpath link @@ -13,15 +13,16 @@ ld: warning: liblttng-ust-tracepoint.so.1, needed by ../../../src/lib/lttng-ust/ Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/61] Signed-off-by: Changqing Li + --- doc/examples/Makefile.am | 2 +- - 1 file changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am -index 8ee0564..20d246c 100644 +index 57782cc..d46caa6 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am -@@ -142,7 +142,7 @@ all-local: +@@ -167,7 +167,7 @@ all-local: CFLAGS='$(CFLAGS)' \ AM_CFLAGS='$(AM_CFLAGS)' \ LDFLAGS="$(LDFLAGS)" \ @@ -30,6 +31,3 @@ index 8ee0564..20d246c 100644 LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ AM_V_P="$(AM_V_P)" \ AM_V_at="$(AM_V_at)" \ --- -2.17.1 - 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 d3c451fd2b..e85dbdb439 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 2058584b7e87d6bd9d1765577766e0df7752232c Mon Sep 17 00:00:00 2001 +From 27402453f25fbdb5a9fb1a1b88d1c4d9852187d2 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,15 +7,16 @@ 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/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am -index caeea2b..30febf0 100644 +index 1ccc290..6531fa0 100644 --- a/src/lib/lttng-ust-common/Makefile.am +++ b/src/lib/lttng-ust-common/Makefile.am -@@ -15,6 +15,7 @@ liblttng_ust_common_la_SOURCES = \ +@@ -16,6 +16,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 fd9b6ea7ff..7c49583e0d 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,6 +1,6 @@ -From dd1fdc841d069dbd4e284f430a88af79de951124 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Thu, 26 Sep 2019 17:54:00 +0800 +From f65efd963e52de51d35e2e03fb773f33dd64f565 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 Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross @@ -15,15 +15,15 @@ Signed-off-by: Robert Yang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am -index f95482d..f76d95b 100644 +index d53e21d..283901e 100644 --- a/src/python-lttngust/Makefile.am +++ b/src/python-lttngust/Makefile.am -@@ -32,7 +32,7 @@ install-exec-local: build-python-bindings.stamp +@@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp if [ "$(DESTDIR)" != "" ]; then \ opts="$$opts --root=$(DESTDIR)"; \ fi; \ -- $(PYTHON) $(builddir)/setup.py install $$opts; -+ $(PYTHON) $(builddir)/setup.py install $$opts --install-lib=$(pythondir); +- $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts; ++ $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts --install-lib=$(pythondir); clean-local: rm -rf $(builddir)/build diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb deleted file mode 100644 index 424b0fa645..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x" -DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library to trace userspace codes." -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" - -PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ - am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ - PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ -" - -inherit autotools lib_package manpages python3native pkgconfig - -include lttng-platforms.inc - -EXTRA_OECONF = "--disable-numa" -CPPFLAGS:append:arm = "${@oe.utils.vartrue('DEBUG_BUILD', '-DUATOMIC_NO_LINK_ERROR', '', d)}" - -DEPENDS = "liburcu util-linux" -RDEPENDS:${PN}-bin = "python3-core" - -# For backwards compatibility after rename -RPROVIDES:${PN} = "lttng2-ust" -RREPLACES:${PN} = "lttng2-ust" -RCONFLICTS:${PN} = "lttng2-ust" - -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-Makefile.am-update-rpath-link.patch \ - " - -SRC_URI[sha256sum] = "e7e04596dd73ac7aa99e27cd000f949dbb0fed51bd29099f9b08a25c1df0ced5" - -CVE_PRODUCT = "ust" - -PACKAGECONFIG[examples] = "--enable-examples, --disable-examples," -PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" -PACKAGECONFIG[python3-agent] = "--enable-python-agent ${PYTHON_OPTION}, --disable-python-agent, python3, python3" - -FILES:${PN} += " ${PYTHON_SITEPACKAGES_DIR}/*" -FILES:${PN}-staticdev += " ${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES:${PN}-dev += " ${PYTHON_SITEPACKAGES_DIR}/*.la" - -do_install:append() { - # Patch python tools to use Python 3; they should be source compatible, but - # still refer to Python 2 in the shebang - sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp -} diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb new file mode 100644 index 0000000000..9509185bad --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb @@ -0,0 +1,53 @@ +SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x" +DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library to trace userspace codes." +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" + +PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ + am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ + PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ +" + +inherit autotools lib_package manpages python3native pkgconfig + +include lttng-platforms.inc + +EXTRA_OECONF = "--disable-numa" +CPPFLAGS:append:arm = "${@oe.utils.vartrue('DEBUG_BUILD', '-DUATOMIC_NO_LINK_ERROR', '', d)}" + +DEPENDS = "liburcu util-linux" +RDEPENDS:${PN}-bin = "python3-core" + +# For backwards compatibility after rename +RPROVIDES:${PN} = "lttng2-ust" +RREPLACES:${PN} = "lttng2-ust" +RCONFLICTS:${PN} = "lttng2-ust" + +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-Makefile.am-update-rpath-link.patch \ + " + +SRC_URI[sha256sum] = "5fb4f17c307c8c1b79c68561e89be9562d07e7425bf40e728c4d66755342a5eb" + +CVE_PRODUCT = "ust" + +PACKAGECONFIG[examples] = "--enable-examples, --disable-examples," +PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" +PACKAGECONFIG[python3-agent] = "--enable-python-agent ${PYTHON_OPTION}, --disable-python-agent, python3, python3" + +FILES:${PN} += " ${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN}-staticdev += " ${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES:${PN}-dev += " ${PYTHON_SITEPACKAGES_DIR}/*.la" + +do_install:append() { + # Patch python tools to use Python 3; they should be source compatible, but + # still refer to Python 2 in the shebang + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp +} -- cgit v1.2.3-54-g00ecf