From 0d35cf40fd0e80513036a1d741a744f40a399bc0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 12 Dec 2019 16:36:48 +0100 Subject: [PATCH] lttng-ust: update to 2.11.0 Remove patch as issue addressed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../lttng-ust-doc-examples-disable.patch | 17 ----------------- ...{lttng-ust_2.10.5.bb => lttng-ust_2.11.0.bb} | 9 +++++---- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch rename meta/recipes-kernel/lttng/{lttng-ust_2.10.5.bb => lttng-ust_2.11.0.bb} (89%) diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch deleted file mode 100644 index bff852799d..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Don't build the doc examples - we don't need them and in fact they -never successfully built in previous iterations of the lttng-ust -recipe anyway. - -Signed-off-by: Tom Zanussi - -Index: lttng-ust-2.9.1/doc/Makefile.am -=================================================================== ---- lttng-ust-2.9.1.orig/doc/Makefile.am -+++ lttng-ust-2.9.1/doc/Makefile.am -@@ -1,3 +1,3 @@ --SUBDIRS = . man examples -+SUBDIRS = . man - - dist_doc_DATA = java-agent.txt diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb b/meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb similarity index 89% rename from meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb rename to meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb index cfaad30b69..6d7c05e65e 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb @@ -15,6 +15,8 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ inherit autotools lib_package manpages python3native +EXTRA_OECONF = "--disable-numa" + DEPENDS = "liburcu util-linux" RDEPENDS_${PN}-bin = "python3-core" @@ -26,12 +28,11 @@ RCONFLICTS_${PN} = "lttng2-ust" PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ - file://lttng-ust-doc-examples-disable.patch \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ - " + " -SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c" -SRC_URI[sha256sum] = "06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35" +SRC_URI[md5sum] = "99823cfeb76562d753ffe67880e9cc59" +SRC_URI[sha256sum] = "683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8" CVE_PRODUCT = "ust" -- 2.40.1