lttng-modules: bump to version 2.5.0
PATCH 1/4 lttng-modules: bump to version 2.5.0
This version should support kernel up to 3.15.
--- package/lttng-modules/lttng-modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-modules/lttng-modules.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.4.1 +LTTNG_MODULES_VERSION = 2.5.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
Signature · 1 line
1.9.1
PATCH 2/4 lttng-tools: bump to version 2.5.0
libxml2 is now necessary
--- package/lttng-tools/Config.in | 1 + package/lttng-tools/lttng-tools.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
package/lttng-tools/Config.in +1 -0
@@ -1,6 +1,7 @@ config BR2_PACKAGE_LTTNG_TOOLS bool "lttng-tools" select BR2_PACKAGE_LIBURCU + select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_POPT select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID
package/lttng-tools/lttng-tools.mk +3 -2
@@ -4,17 +4,18 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.4.1 +LTTNG_TOOLS_VERSION = 2.5.0 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/* LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE +LTTNG_TOOLS_CONF_OPT += --with-xml-prefix=$(STAGING_DIR)/usr # The host-lttng-babeltrace technically isn't a required build # dependency. However, having the babeltrace utilities built for the # host is very useful, since those tools allow to convert the binary # trace format into an human readable format. -LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace util-linux +LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt host-lttng-babeltrace util-linux LTTNG_AUTORECONF = YES
Signature · 1 line
1.9.1
PATCH 2/4 lttng-tools: bump to version 2.5.0
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?r?me" == J?r?me Pouiller <[email protected]> writes:
libxml2 is now necessary
Signed-off-by J?r?me Pouiller <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/4 lttng-libust: bump to version 2.5.0
In reply to Jérôme Pouillerlttng-libust-0001-Disable-liblttng-ust-dl-if-dlinfo-is-not-available.patch was upstreamed
--- ...iblttng-ust-dl-if-dlinfo-is-not-available.patch | 79 ---------------------- package/lttng-libust/lttng-libust.mk | 2 +- 2 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 package/lttng-libust/lttng-libust-0001-Disable-liblttng-ust-dl-if-dlinfo-is-not-available.patch
package/lttng-libust/lttng-libust-0001-Disable-liblttng-ust-dl-if-dlinfo-is-not-available.patch deleted +0 -79
@@ -1,79 +0,0 @@ -From 44316d0214425f5ae0d8af07099caae3e95ac890 Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Tue, 8 Apr 2014 22:15:27 +0200 -Subject: [PATCH 1/1] Fix: disable liblttng-ust-dl if dlinfo is not available - in C library - -According to uClibc commit [1], dlinfo is not available in recent uClibc (>0.9.33), -but is available in older version of uClibc (<=0.9.33) whith a different prototype -than dlinfo() in glibc. - -To be able to use LTTng UST with uClibc, we need to disable the Dynamic Linker -Tracing functionality [2]. - -A specific test on dlinfo() prototype is performed to enable or disable this -functionality. - -[1] http://git.uclibc.org/uClibc/commit/?id=f3c9dc499c5c787ddd8c4320f2d44d2ae6e40c22 -[2] http://lists.lttng.org/pipermail/lttng-dev/2014-February/022423.html - -Signed-off-by: Romain Naour <[email protected]> ---- - Makefile.am | 5 ++++- - configure.ac | 18 ++++++++++++++++++ - 2 files changed, 22 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b79d2dd..c907ff1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,11 +4,14 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ - liblttng-ust \ - liblttng-ust-ctl \ - liblttng-ust-fork \ -- liblttng-ust-dl \ - liblttng-ust-libc-wrapper \ - liblttng-ust-cyg-profile \ - tools - -+if HAVE_DLINFO -+SUBDIRS += liblttng-ust-dl -+endif -+ - if BUILD_JNI_INTERFACE - SUBDIRS += liblttng-ust-java liblttng-ust-jul - endif -diff --git a/configure.ac b/configure.ac -index b04d4e3..f4b499b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,8 +119,26 @@ AC_CHECK_LIB([dl], [dlopen], - AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.]) - ]) - ]) -+AS_IF([test "$x$have_libdl" = "yes" || test "x$have_libc_dl" = "xyes"], -+ [AC_MSG_CHECKING([for dlinfo()]) -+ # Ensure the check is covered by the LIBS variable -+ LIBS="$LIBS -ldl" -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[#define _GNU_SOURCE /* Required on Linux to get GNU extensions */ -+ #include <dlfcn.h>]], -+ [[dlinfo(0, 0, 0);]])], -+ [AC_MSG_RESULT([yes]) -+ dlinfo_ok=yes; -+ ], -+ [AC_MSG_RESULT([no]) -+ AC_MSG_WARN([dlinfo() is not available, the Dynamic Linker Tracing functionality is disabled.]) -+ dlinfo_ok=no; -+ ]) -+ ], -+ [dlinfo_ok=no]) - AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"]) - AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"]) -+AM_CONDITIONAL([HAVE_DLINFO], [test "dlinfo_ok" = "yes"]) - - AC_CHECK_LIB([pthread], [pthread_create]) - --- -1.9.0 -
package/lttng-libust/lttng-libust.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.4.1 +LTTNG_LIBUST_VERSION = 2.5.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING
Signature · 1 line
1.9.1
PATCH 3/4 lttng-libust: bump to version 2.5.0
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?r?me" == J?r?me Pouiller <[email protected]> writes:
lttng-libust-0001-Disable-liblttng-ust-dl-if-dlinfo-is-not-available.patch was upstreamed
Then we can presumably drop AUTORECONF = YES?
Committed with that fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 lttng-babeltrace: bump to version 1.2.2
In reply to Jérôme Pouiller--- package/lttng-babeltrace/lttng-babeltrace.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-babeltrace/lttng-babeltrace.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace -LTTNG_BABELTRACE_VERSION = 1.2.1 +LTTNG_BABELTRACE_VERSION = 1.2.2 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT; LGPL2.1 for include/babeltrace/list.h; GPLv2+ for test code LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
Signature · 1 line
1.9.1
PATCH 4/4 lttng-babeltrace: bump to version 1.2.2
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?r?me" == J?r?me Pouiller <[email protected]> writes:
Signed-off-by J?r?me Pouiller <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/4 lttng-modules: bump to version 2.5.0
In reply to Jérôme PouillerQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?r?me" == J?r?me Pouiller <[email protected]> writes:
This version should support kernel up to 3.15.
Signed-off-by J?r?me Pouiller <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard