package/lttng-libust: bump version to 2.11.0
PATCH 1/3 package/lttng-libust: bump version to 2.11.0
Remove 0001-configure.ac-add-disable-examples-option-to-not-buil.patch as the --disable-examples option exists in LTTng-UST 2.11.0.
Now passing --disable-numa to the configure script when libnuma is not available.
--- ...-disable-examples-option-to-not-buil.patch | 68 ------------------- package/lttng-libust/lttng-libust.hash | 4 +- package/lttng-libust/lttng-libust.mk | 8 ++- 3 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch
package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch deleted +0 -68
@@ -1,68 +0,0 @@ -From 08aa9a26779d4ede3de7857fafd03bd6331ba948 Mon Sep 17 00:00:00 2001 -From: Philippe Proulx <[email protected]> -Date: Mon, 6 Nov 2017 15:46:03 -0500 -Subject: [PATCH] configure.ac: add --disable-examples option to not - build/install examples - -Some environments and distributions do not need the LTTng-UST examples -to be built because they remove them anyway. Continue to build them by -default, but add --disable-examples to explicitly disable them. - -Signed-off-by: Philippe Proulx <[email protected]> -[Philippe: backport from upstream commit 08aa9a26] -Signed-off-by: Mathieu Desnoyers <[email protected]> ---- - configure.ac | 16 ++++++++++++++++ - doc/Makefile.am | 6 +++++- - 2 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 10087f3f..68f41315 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -423,6 +423,19 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], - AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"]) - AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"]) - -+# Enable building examples -+AC_ARG_ENABLE( -+ examples, -+ AS_HELP_STRING( -+ [--disable-examples], -+ [Do not build and install examples] -+ ), -+ [enable_examples=$enableval], -+ [enable_examples=yes] -+) -+ -+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"]) -+ - # Set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file - # is not distributed in tarballs. - AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) -@@ -596,6 +609,9 @@ PPRINT_PROP_BOOL([NUMA], $value) - AS_ECHO - PPRINT_SET_INDENT(0) - -+test "x$enable_examples" = xyes && value=1 || value=0 -+PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE) -+ - # man pages build enabled/disabled - m4_pushdef([build_man_pages_msg], [Build and install man pages]) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index e110ed85..a67c8c22 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,3 +1,7 @@ --SUBDIRS = . man examples -+SUBDIRS = . man -+ -+if ENABLE_EXAMPLES -+SUBDIRS += examples -+endif - - dist_doc_DATA = java-agent.txt --- -2.15.0 -
package/lttng-libust/lttng-libust.hash +2 -2
@@ -1,5 +1,5 @@ -# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.5.tar.bz2.sha256 -sha256 06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35 lttng-ust-2.10.5.tar.bz2 +# From https://lttng.org/files/lttng-ust/lttng-ust-2.11.0.tar.bz2.sha256 +sha256 683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 lttng-ust-2.11.0.tar.bz2 # Hash for license file sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING
package/lttng-libust/lttng-libust.mk +5 -3
@@ -5,15 +5,13 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.10.5 +LTTNG_LIBUST_VERSION = 2.11.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples -# 0001-configure.ac-add-disable-examples-option-to-not-buil.patch -LTTNG_LIBUST_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python
@@ -26,4 +24,8 @@ LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" LTTNG_LIBUST_CONF_OPTS += --disable-python-agent endif +ifneq ($(BR2_PACKAGE_NUMACTL),y) +LTTNG_LIBUST_CONF_OPTS += --disable-numa +endif + $(eval $(autotools-package))
Signature · 1 line
2.23.0
PATCH 2/3 package/lttng-tools: bump version to 2.11.0
--- package/lttng-tools/lttng-tools.hash | 4 ++-- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/lttng-tools/lttng-tools.hash +2 -2
@@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.10.8.tar.bz2.sha256 -sha256 664a1145f9fd7a574da18aa3dfbbe97983985a471ca2992d6b272f1cebe6b30d lttng-tools-2.10.8.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.11.0.tar.bz2.sha256 +sha256 dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc lttng-tools-2.11.0.tar.bz2 # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe lgpl-2.1.txt
package/lttng-tools/lttng-tools.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.10.8 +LTTNG_TOOLS_VERSION = 2.11.0 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES
Signature · 1 line
2.23.0
Thomas Petazzoni
AppliedPATCH 2/3 package/lttng-tools: bump version to 2.11.0
Quoted 5 lines · On Tue, 22 Oct 2019 10:48:04 -0400 Philippe Proulx <[email protected]>…
Signed-off-by Philippe Proulx <[email protected]>--- package/lttng-tools/lttng-tools.hash | 4 ++-- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 package/lttng-modules: bump version to 2.11.0
In reply to Philippe Proulx--- package/lttng-modules/lttng-modules.hash | 4 ++-- package/lttng-modules/lttng-modules.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/lttng-modules/lttng-modules.hash +2 -2
@@ -1,5 +1,5 @@ -# From http://lttng.org/files/lttng-modules/lttng-modules-2.10.11.tar.bz2.sha256 -sha256 7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1 lttng-modules-2.10.11.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2.sha256 +sha256 98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f lttng-modules-2.11.0.tar.bz2 # Hash for license files sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt
package/lttng-modules/lttng-modules.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.10.11 +LTTNG_MODULES_VERSION = 2.11.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
Signature · 1 line
2.23.0
Thomas Petazzoni
AppliedPATCH 3/3 package/lttng-modules: bump version to 2.11.0
Quoted 5 lines · On Tue, 22 Oct 2019 10:48:05 -0400 Philippe Proulx <[email protected]>…
Signed-off-by Philippe Proulx <[email protected]>--- package/lttng-modules/lttng-modules.hash | 4 ++-- package/lttng-modules/lttng-modules.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/3 package/lttng-libust: bump version to 2.11.0
In reply to Philippe Proulxpackage/lttng-libust/lttng-libust.mk LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" · line 29
Quoted 3 lines · On Tue, 22 Oct 2019 10:48:03 -0400 Philippe Proulx <[email protected]>…
package/lttng-libust/lttng-libust.mk +3
-0+ifneq ($(BR2_PACKAGE_NUMACTL),y) +LTTNG_LIBUST_CONF_OPTS += --disable-numa +endif
This is not good: what happens when numactl is enabled ?
So, I changed this to:
ifeq ($(BR2_PACKAGE_NUMACTL),y)LTTNG_LIBUST_DEPENDENCIES += numactlLTTNG_LIBUST_CONF_OPTS += --enable-numa
elseLTTNG_LIBUST_CONF_OPTS += --disable-numa
endif
which is the typical way to handle optional dependencies.
I've applied after fixing this. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/lttng-libust: bump version to 2.11.0
Quoted 19 lines · Thomas Petazzoni
package/lttng-libust/lttng-libust.mk LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" · line 29
Quoted 3 lines · On Tue, 22 Oct 2019 10:48:03 -0400 Philippe Proulx <[email protected]>…
package/lttng-libust/lttng-libust.mk +3
-0+ifneq ($(BR2_PACKAGE_NUMACTL),y) +LTTNG_LIBUST_CONF_OPTS += --disable-numa +endifThis is not good: what happens when numactl is enabled ?
So, I changed this to:
ifeq ($(BR2_PACKAGE_NUMACTL),y)
LTTNG_LIBUST_DEPENDENCIES+= numactlLTTNG_LIBUST_CONF_OPTS+= --enable-numa
elseLTTNG_LIBUST_CONF_OPTS+= --disable-numa
endif
Quoted 3 lines
which is the typical way to handle optional dependencies.
I've applied after fixing this. Thanks!
Ok thanks.
--enable-numa is the default which is why I didn't write it explicitly, but it looks safer your way.
Phil
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
PATCH 1/3 package/lttng-libust: bump version to 2.11.0
Quoted 6 lines · On Tue, 22 Oct 2019 16:20:36 -0400 Philippe Proulx <[email protected]>…
Quoted 1 line
I've applied after fixing this. Thanks!
Ok thanks.
--enable-numais the default which is why I didn't write it explicitly, but it looks safer your way.
Right, but you also didn't add numactl to LTTNG_LIBUST_DEPENDENCIES, so there was nothing that would guarantee it to be built before liblttng-libust.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com