Update LTTng packages to 2.8.x and Babeltrace to 1.4.0

The two current patches are removed because they were merged upstream.

The new patch is needed to build with uClibc. It was also submitted upstream, but not merged as is yet. Defining NT_GNU_BUILD_ID to 3 when it's not defined seems like it's something done in other projects. This definition's value should never change (number of the build ID note section in ELF objects).

LTTng-UST now has its man pages written in AsciiDoc and they get converted to troff at build time. This is not needed in a Buildroot image anyway.

Signed-off-by Philippe Proulx <[email protected]>

---
Changes v2 -> v3:
- Add link to original patch in patch file.
- Move Python agent stuff to another patch.

Changes v1 -> v2:
- Detailed commit message.
- Detailed patch messages.

 ...lf.c-define-NT_GNU_BUILD_ID-if-not-define.patch | 34 ++++++++++++++++++++++
 package/lttng-libust/lttng-libust.hash             | 10 +++----
 package/lttng-libust/lttng-libust.mk               |  8 ++---
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch

package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch new file +34 -0

new file mode 100644
index 0000000..1788a04
@@ -0,0 +1,34 @@
+From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <[email protected]>
+Date: Sat, 29 Oct 2016 13:32:57 -0400
+Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined
+
+On uClibc, NT_GNU_BUILD_ID is not defined, so we define it
+manually in this case.
+
+Signed-off-by: Philippe Proulx <[email protected]>
+[Philippe: grabbed from this pull request:
+    https://github.com/lttng/lttng-ust/pull/39
+]
+---
+ liblttng-ust/lttng-ust-elf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
+index 5f27920..beaa7f3 100644
+--- a/liblttng-ust/lttng-ust-elf.c
++++ b/liblttng-ust/lttng-ust-elf.c
+@@ -29,6 +29,10 @@
+
+ #define BUF_LEN	4096
+
++#ifndef NT_GNU_BUILD_ID
++# define NT_GNU_BUILD_ID	3
++#endif
++
+ /*
+  * Retrieve the nth (where n is the `index` argument) phdr (program
+  * header) from the given elf instance.
+--
+2.9.3
+

package/lttng-libust/lttng-libust.hash +5 -5

index 1494acf..a4a2907 100644
@@ -1,6 +1,6 @@
-# http://www.lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2.sha1
-sha1  597ebecb885debb58c263de57f30b1096d4eefc6  lttng-ust-2.7.1.tar.bz2
+# From http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2.{md5,sha1}
+md5     be505077245dc05f93370a565eec15f4  lttng-ust-2.8.1.tar.bz2
+sha1    8bebdcbcb453d2643fb226dbe92de61764f1ee3b  lttng-ust-2.8.1.tar.bz2
 
-# Locally computed
-sha1  2e79c98e458b2e052930fb81441e6ca8377a2ed7 787364e8bac9a146f9d65c763633c2b75eb76463.patch
-sha1  cf77ec415111f77573be7917d9b62d8e49dc6304 30307a67b48641875b122d8f832bbfb454e95d92.patch
+# Locally generated
+sha256  6e41349107e83e7b43c69ed358e48788ca2fd095bad61737b850e3f3d2c0508a  lttng-ust-2.8.1.tar.bz2

package/lttng-libust/lttng-libust.mk +2 -7

index 61ffed4..feeeb43 100644
@@ -5,17 +5,13 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.7.1
+LTTNG_LIBUST_VERSION = 2.8.1
 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
 LTTNG_LIBUST_LICENSE_FILES = COPYING
-
-LTTNG_LIBUST_PATCH = \
-	https://github.com/lttng/lttng-ust/commit/787364e8bac9a146f9d65c763633c2b75eb76463.patch \
-	https://github.com/lttng/lttng-ust/commit/30307a67b48641875b122d8f832bbfb454e95d92.patch
-
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
+LTTNG_LIBUST_CONF_OPTS += --disable-man-pages
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 LTTNG_LIBUST_DEPENDENCIES += python
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

The two current patches are removed because they were merged upstream.

The new patch is needed to build with uClibc. It was also submitted upstream, but not merged as is yet. Defining NT_GNU_BUILD_ID to 3 when it's not defined seems like it's something done in other projects. This definition's value should never change (number of the build ID note section in ELF objects).

LTTng-UST now has its man pages written in AsciiDoc and they get converted to troff at build time. This is not needed in a Buildroot image anyway.

Signed-off-by Philippe Proulx <[email protected]>

---
Changes v2 -> v3:
- Add link to original patch in patch file.
- Move Python agent stuff to another patch.

Add the --enable-python-agent configure option to build the LTTng-UST Python agent when Python 2 or Python 3 is also part of the BR image. The LTTng-UST Python agent is a Python package which adds LTTng tracing to Python's standard logging when imported.

Disable the Python agent otherwise.

Signed-off-by Philippe Proulx <[email protected]>

---
This is a new patch in v3.

 package/lttng-libust/lttng-libust.mk | 3 +++
 1 file changed, 3 insertions(+)

package/lttng-libust/lttng-libust.mk +3 -1

index feeeb43..7a83f46 100644
@@ -15,10 +15,13 @@ LTTNG_LIBUST_CONF_OPTS += --disable-man-pages
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 LTTNG_LIBUST_DEPENDENCIES += python
+LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
 else ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LTTNG_LIBUST_DEPENDENCIES += python3
+LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
 else
 LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none"
+LTTNG_LIBUST_CONF_OPTS += --disable-python-agent
 endif
 
 $(eval $(autotools-package))
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Add the --enable-python-agent configure option to build the LTTng-UST Python agent when Python 2 or Python 3 is also part of the BR image. The LTTng-UST Python agent is a Python package which adds LTTng tracing to Python's standard logging when imported.

Disable the Python agent otherwise.

Signed-off-by Philippe Proulx <[email protected]>

---
This is a new patch in v3.

The current patches are dropped because they were merged upstream.

The new patches exist to fix the build with musl. They were submitted on the lttng-dev mailing list, but not merged yet, or not merged in 2.8.2.

LTTng-tools now has its man pages written in AsciiDoc and they get converted to troff at build time. This is not needed in a Buildroot image anyway.

The --enable-lttng-ust/--disable-lttng-ust configure options are renamed to --with-lttng-ust/--without-lttng-ust in v2.8.

Signed-off-by Philippe Proulx <[email protected]>

---
Changes v2 -> v3:
- Add links to original patches in patch files.
- Remove the original patch index from the subject of patch files.

+Subject: [PATCH lttng-tools 4/4] Fix: strerror_r behavior is glibc specific

The current patches are dropped because they were merged upstream.

The new patches exist to fix the build with musl. They were submitted on the lttng-dev mailing list, but not merged yet, or not merged in 2.8.2.

LTTng-tools now has its man pages written in AsciiDoc and they get converted to troff at build time. This is not needed in a Buildroot image anyway.

The --enable-lttng-ust/--disable-lttng-ust configure options are renamed to --with-lttng-ust/--without-lttng-ust in v2.8.

Signed-off-by Philippe Proulx <[email protected]>

Quoted 1 line

Quoted 1 line

lttng-tools 2.8.2 Extracting

Quoted 1 line

Quoted 1 line

lttng-tools 2.8.2 Patching

We don't need to build Babeltrace for the host here. Any host running a major Linux distribution can get a recent version of Babeltrace.

See <http://diamon.org/babeltrace/>.

Signed-off-by Philippe Proulx <[email protected]>

Reviewed-by Thomas Petazzoni <[email protected]>

---
Changes v2 -> v3:
- Nothing changed.

Changes v1 -> v2:
- Add Reviewed-by tag.

 package/lttng-tools/lttng-tools.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

package/lttng-tools/lttng-tools.mk +1 -7

index 3d884d3..9d9cb1c 100644
@@ -10,12 +10,7 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 LTTNG_TOOLS_LICENSE = GPLv2+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
 LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
 LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr --disable-man-pages
-
-# 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 libxml2 popt host-lttng-babeltrace util-linux
+LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
 
 ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
 LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

We don't need to build Babeltrace for the host here. Any host running a major Linux distribution can get a recent version of Babeltrace.

See <http://diamon.org/babeltrace/>.

Signed-off-by Philippe Proulx <[email protected]>

Reviewed-by Thomas Petazzoni <[email protected]>

---
Changes v2 -> v3:
- Nothing changed.

LTTng-modules, starting from v2.8, has a mechanism to be built directly into a Linux kernel image, that is, not as loadable kernel modules. For this the CONFIG_LTTNG_CLOCK_PLUGIN_TEST and CONFIG_LTTNG Make variables were introduced. They need to be explicitly set to m here to build the project as loadable kernel modules.

Signed-off-by Philippe Proulx <[email protected]>

---
Changes v2 -> v3:
- Go back to kernel-module infra, but with custom Make options.

Changes v1 -> v2:
- Detailed commit message.

 package/lttng-modules/lttng-modules.hash | 6 ++++--
 package/lttng-modules/lttng-modules.mk   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

package/lttng-modules/lttng-modules.hash +4 -2

index 2d50287..81e2d5c 100644
@@ -1,2 +1,4 @@
-# from http://lttng.org/files/lttng-tools/lttng-modules-2.7.1.tar.bz2.sha1
-sha1  38c42ec89b4966c7a4cc04aea75f5841634d8d66  lttng-modules-2.7.1.tar.bz2
+# From http://lttng.org/files/lttng-modules/lttng-modules-2.8.3.tar.bz2.{md5,sha1}
+md5   424354c4834d20235dacd9a1fd7653b6  lttng-modules-2.8.3.tar.bz2
+sha1  862705784a54962f70226004f1fd0bf77f73f10f  lttng-modules-2.8.3.tar.bz2
+

package/lttng-modules/lttng-modules.mk +2 -2

index 5d0c422..9ecf572 100644
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.7.1
+LTTNG_MODULES_VERSION = 2.8.3
 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 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
 LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
+LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m
 
 $(eval $(kernel-module))
 $(eval $(generic-package))
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Current patches are dropped because they were merged upstream.

Official upstream site of Babeltrace for the distribution of tarballs changed from lttng.org to efficios.com (see
<http://diamon.org/babeltrace>).

Official Babeltrace's website changed from
<http://www.efficios.com/babeltrace> to <http://diamon.org/babeltrace>.

I explicitly disable the support for debug informations in this patch to add it in a separate patch.

Signed-off-by Philippe Proulx <[email protected]>

---
Changes v2 -> v3:
- Add links to original patches in patch files.
- Do not take care of debug info stuff in this patch.
- Do not remove the host babeltrace build (needed for the next patch).

Changes v1 -> v2:
- Detailed commit message.
- Detailed patch messages.
- Add comment above LTTNG_BABELTRACE_AUTORECONF = YES in lttng-babeltrace.mk.

 ...c-remove-elfutils-version-test-for-Buildr.patch | 30 +++++++++++
 .../0001-no-posix-fallocate-in-uclibc.patch        | 37 -------------
 ...ix-uuid-support-detection-on-static-build.patch | 63 ----------------------
 ...b-Makefile.am-remove-unneeded-static-flag.patch | 36 +++++++++++++
 package/lttng-babeltrace/Config.in                 | 10 ++--
 package/lttng-babeltrace/lttng-babeltrace.hash     | 11 ++--
 package/lttng-babeltrace/lttng-babeltrace.mk       |  8 +--
 7 files changed, 79 insertions(+), 116 deletions(-)
 create mode 100644 package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 delete mode 100644 package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
 delete mode 100644 package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
 create mode 100644 package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch

package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch new file +30 -0

new file mode 100644
index 0000000..831a04c
@@ -0,0 +1,30 @@
+From d3cce60dfde30bd2fd67caa3fbc5f111131c243a Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <[email protected]>
+Date: Fri, 28 Oct 2016 01:48:25 -0400
+Subject: [PATCH] configure.ac: remove elfutils version test for Buildroot
+
+The AX_LIB_ELFUTILS macro builds an executable file and executes it to
+discover the version of elfutils. Obviously we cannot execute a
+cross-compiled program here, hence this test is removed because we know
+that elfutils's version is greater than 0.154 anyway in Buildroot.
+
+Signed-off-by: Philippe Proulx <[email protected]>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b7bde2..f1bfe52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -268,7 +268,6 @@ AS_IF([test "x$_enable_debug_info" = xyes], [
+ 	    # Check if libelf and libdw are present
+ 	    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+ 	    AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+-	    AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
+             AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])
+ ], [])
+
+--
+2.9.3
+

package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch deleted +0 -37

deleted file mode 100644
index d77825f..0000000
@@ -1,37 +0,0 @@
-Do not call posix_fallocate() on uClibc
-
-uClibc does not implement posix_fallocate(), and posix_fallocate() is
-mostly only an hint to the kernel that we will need such or such
-amount of space inside a file. So we just don't call posix_fallocate()
-when building against uClibc.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: add #include <features.h>
----
- formats/ctf/ctf.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: lttng-babeltrace-0.8/formats/ctf/ctf.c
-===================================================================
---- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c
-+++ lttng-babeltrace-0.8/formats/ctf/ctf.c
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <dirent.h>
-+#include <features.h>
- #include <glib.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -384,9 +385,11 @@
- 		}
- 		pos->content_size = -1U;	/* Unknown at this point */
- 		pos->packet_size = WRITE_PACKET_LEN;
-+#ifndef __UCLIBC__
- 		off = posix_fallocate(pos->fd, pos->mmap_offset,
- 				      pos->packet_size / CHAR_BIT);
- 		assert(off >= 0);
-+#endif
- 		pos->offset = 0;
- 	} else {
- 	read_next_packet:

package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch deleted +0 -63

deleted file mode 100644
index 849c0a3..0000000
@@ -1,63 +0,0 @@
-From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <[email protected]>
-Date: Sat, 28 May 2016 12:53:33 +0200
-Subject: [PATCH] configure: fix uuid support detection on static build
-
-This change adds uuid support detection using pkg-config, before falling
-back on default AC_CHECK_LIB calls.
-
-Using flags from pkg-config is useful for static build, because they
-also include dependency flags; whereas
-
-AC_CHECK_LIB function achieves its test by trying to link against the
-requested library, without taking care of its dependency
-requirements/flags. Therefore, in case of static build, it can fail on
-the uuid detection like [1], because the uuid's dependency flags
-(regarding gettext) are missing.
-Instead, using pkg-config to do the check will take care of getting and
-setting all required flags.
-
-This change adds uuid detection using pkg-config helper before falling
-back on the standard AC_CHECK_LIB detection for platforms missing
-pkg-config.
-
-This issue [1] has been triggered on Buildroot farms.
-
-[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log
-
-Signed-off-by: Samuel Martin <[email protected]>
----
- configure.ac | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 632fe39..b344fa8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,15 @@ esac
- AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
-
- # Check for libuuid
-+PKG_CHECK_MODULES([UUID], [uuid],
-+[
-+	LIBS="${UUID_LIBS} ${LIBS}"
-+	CFLAGS="${CFLAGS} ${UUID_CFLAGS}"
-+	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
-+	have_libuuid=yes
-+],
-+[
-+# try detecting libuuid without pkg-config
- AC_CHECK_LIB([uuid], [uuid_generate],
- [
- 	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
-@@ -83,6 +92,7 @@ AC_CHECK_LIB([uuid], [uuid_generate],
- 			AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
- 		fi
- 	])
-+])
- ]
- )
- AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
---
-2.8.3
-

package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch new file +36 -0

new file mode 100644
index 0000000..b903d87
@@ -0,0 +1,36 @@
+From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <[email protected]>
+Date: Fri, 28 Oct 2016 02:09:20 -0400
+Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag
+
+Having those -static flags breaks the build in shared-only builds.
+
+Signed-off-by: Philippe Proulx <[email protected]>
+[Philippe: grabbed from this pull request:
+    https://github.com/efficios/babeltrace/pull/49
+]
+---
+ tests/lib/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
+index 33ada16..c685e77 100644
+--- a/tests/lib/Makefile.am
++++ b/tests/lib/Makefile.am
+@@ -31,13 +31,11 @@ check_SCRIPTS = test_seek_big_trace \
+ 		test_ctf_writer_complete
+
+ if ENABLE_DEBUG_INFO
+-test_dwarf_LDFLAGS = -static
+ test_dwarf_LDADD = $(LIBTAP) \
+ 	$(top_builddir)/lib/libbabeltrace.la \
+ 	$(top_builddir)/lib/libdebug-info.la
+ test_dwarf_SOURCES = test_dwarf.c
+
+-test_bin_info_LDFLAGS = -static
+ test_bin_info_LDADD = $(LIBTAP) \
+ 	$(top_builddir)/lib/libbabeltrace.la \
+ 	$(top_builddir)/lib/libdebug-info.la
+--
+2.9.3
+

package/lttng-babeltrace/Config.in +4 -6

index d362779..2e8d778 100644
@@ -14,18 +14,16 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	  to/from another trace format.
 
 	  Babeltrace is the reference implementation of the Common
-	  Trace Format (see <http://diamon.org/docs/ctf/>). Babeltrace
+	  Trace Format (see <http://diamon.org/ctf/>). Babeltrace
 	  can decode and display LTTng traces, since the latter are
 	  written using the CTF format.
 
 	  Having this tool on the target is not mandatory. You can
 	  transfer the binary trace output from the target to your
-	  development workstation, and use babeltrace here. Buildroot
-	  automatically builds a host babeltrace in
-	  $(O)/host/usr/bin/babeltrace as a dependency of the
-	  lttng-tools package.
+	  development workstation, and use babeltrace here. Babeltrace
+	  is packaged for all major Linux distributions.
 
-	  http://www.efficios.com/babeltrace
+	  http://diamon.org/babeltrace
 
 comment "lttng-babeltrace needs a toolchain w/ wchar, threads"
 	depends on BR2_USE_MMU

package/lttng-babeltrace/lttng-babeltrace.hash +5 -6

index a9f45b2..bca0bdb 100644
@@ -1,7 +1,6 @@
-# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.md5
-md5     20a806fa7570e69a91707855a98f3ca6 babeltrace-1.2.4.tar.bz2
-# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.sha1
-sha1    c72a80e8fd905cb1ae3b0cf88885517faafe0fa1  babeltrace-1.2.4.tar.bz2
-# Locally generated
-sha256  666e3a1ad2dc7d5703059963056e7800f0eab59c8eeb6be2efe4f3acc5209eb1  babeltrace-1.2.4.tar.bz2
+# From http://www.efficios.com/files/babeltrace/babeltrace-1.4.0.tar.bz2.{md5,sha1}
+md5     fa99064048af5c9c6ff00e489ac809c2  babeltrace-1.4.0.tar.bz2
+sha1    3b162480ee883625e8581bf163817f78a4b6487b  babeltrace-1.4.0.tar.bz2
 
+# Locally generated
+sha256  9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4  babeltrace-1.4.0.tar.bz2

package/lttng-babeltrace/lttng-babeltrace.mk +4 -5

index b2e03a9..da18f88 100644
@@ -4,17 +4,17 @@
 #
 ################################################################################
 
-LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
-LTTNG_BABELTRACE_VERSION = 1.2.4
+LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
+LTTNG_BABELTRACE_VERSION = 1.4.0
 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
 LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
-
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
+LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 HOST_LTTNG_BABELTRACE_DEPENDENCIES = \
 	host-popt host-util-linux host-libglib2 host-pkgconf
 
-# for 0002-configure-fix-uuid-support-detection-on-static-build.patch
+# For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 LTTNG_BABELTRACE_AUTORECONF = YES
 
 $(eval $(autotools-package))
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Current patches are dropped because they were merged upstream.

Official upstream site of Babeltrace for the distribution of tarballs changed from lttng.org to efficios.com (see
<http://diamon.org/babeltrace>).

Official Babeltrace's website changed from
<http://www.efficios.com/babeltrace> to <http://diamon.org/babeltrace>.

I explicitly disable the support for debug informations in this patch to add it in a separate patch.

Signed-off-by Philippe Proulx <[email protected]>

Although Babeltrace is available for all major Linux distributions, some of them have a quite old version of this project.

Signed-off-by Philippe Proulx <[email protected]>

package/lttng-babeltrace/Config.in.host new file +6 -0

new file mode 100644
index 0000000..5da482e
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_HOST_LTTNG_BABELTRACE
+	bool "host lttng-babeltrace"
+	help
+	  The Babeltrace project provides trace read and write
+	  libraries, as well as a trace converter application. Plugins
+	  can be created for any trace format to allow its conversion

package/lttng-babeltrace/Config.in.host new file +1 -0

+	  http://diamon.org/babeltrace

package/lttng-babeltrace/lttng-babeltrace.mk +1 -1

index da18f88..30c5f6e 100644
@@ -13,6 +13,7 @@ LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
 LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 HOST_LTTNG_BABELTRACE_DEPENDENCIES = \
 	host-popt host-util-linux host-libglib2 host-pkgconf
+HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 
 # For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 LTTNG_BABELTRACE_AUTORECONF = YES
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Philippe, All,

On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:

Quoted 4 lines

Although Babeltrace is available for all major Linux distributions, some of them have a quite old version of this project.

Signed-off-by Philippe Proulx <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

However, small nit, see below...

[--SNIP--]

Quoted 17 lines

package/lttng-babeltrace/Config.in.host new file +11 -0

new file mode 100644
index 0000000..5da482e
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_HOST_LTTNG_BABELTRACE
+     bool "host lttng-babeltrace"
+     help
+       The Babeltrace project provides trace read and write
+       libraries, as well as a trace converter application. Plugins
+       can be created for any trace format to allow its conversion
+       to/from another trace format.
+
+       Babeltrace is the reference implementation of the Common
+       Trace Format (see <http://diamon.org/ctf/>). Babeltrace
+       can decode and display LTTng traces, since the latter are

package/lttng-babeltrace/Config.in.host line 16

Quoted 5 lines

package/lttng-babeltrace/Config.in.host new file +5 -0

+       written using the CTF format.
+
+       Having this tool on the target is not mandatory. You can
+       transfer the binary trace output from the target to your
+       development workstation, and use babeltrace here.

You can probably get rid of this paragraph, as this is the host variant of the package.

Regards,
Yann E. MORIN.

Quoted 16 lines

package/lttng-babeltrace/Config.in.host new file +1 -0

+       http://diamon.org/babeltrace

package/lttng-babeltrace/lttng-babeltrace.mk +1 -1

index da18f88..30c5f6e 100644
@@ -13,6 +13,7 @@ LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
 LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 HOST_LTTNG_BABELTRACE_DEPENDENCIES = \
      host-popt host-util-linux host-libglib2 host-pkgconf
+HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 
 # For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 LTTNG_BABELTRACE_AUTORECONF = YES
--

2.9.3

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Since Babeltrace 1.4, there is support for printing debug information along with compatible traces and event records. Babeltrace needs elfutils in this case. If elfutils can be built with the current configuration, the lttng-babeltrace package selects it and builds with support for debug information. Otherwise the menuconfig shows a comment which explains why debug information support cannot be built.

Signed-off-by Philippe Proulx <[email protected]>

---
This is a new patch in v3.

 package/lttng-babeltrace/Config.in           | 17 +++++++++++++++++
 package/lttng-babeltrace/lttng-babeltrace.mk |  7 +++++++
 2 files changed, 24 insertions(+)

package/lttng-babeltrace/Config.in +17 -0

index 95b635d..55e2143 100644
@@ -27,6 +27,23 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 	  http://diamon.org/babeltrace
 
+if BR2_PACKAGE_LTTNG_BABELTRACE
+
+config BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO
+	bool
+	default y
+	depends on !BR2_bfin # elfutils
+	depends on !BR2_STATIC_LIBS # elfutils
+	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
+	select BR2_PACKAGE_ELFUTILS
+
+comment "handling debug info in traces needs a glibc or uClibc toolchain w/ dynamic library"
+	depends on !BR2_bfin # elfutils
+	depends on BR2_STATIC_LIBS \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
+
+endif
+
 comment "lttng-babeltrace needs a toolchain w/ wchar, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

package/lttng-babeltrace/lttng-babeltrace.mk +7 -1

index 30c5f6e..260a8ee 100644
@@ -18,5 +18,12 @@ HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 # For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 LTTNG_BABELTRACE_AUTORECONF = YES
 
+ifeq ($(BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO),y)
+LTTNG_BABELTRACE_DEPENDENCIES += elfutils
+LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info
+else
+LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:

Quoted 9 lines

Since Babeltrace 1.4, there is support for printing debug information along with compatible traces and event records. Babeltrace needs elfutils in this case. If elfutils can be built with the current configuration, the lttng-babeltrace package selects it and builds with support for debug information. Otherwise the menuconfig shows a comment which explains why debug information support cannot be built.

Signed-off-by Philippe Proulx <[email protected]>

Quoted 8 lines

package/lttng-babeltrace/lttng-babeltrace.mk +0 -0

index 30c5f6e..260a8ee 100644
@@ -18,5 +18,12 @@ HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
 # For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 LTTNG_BABELTRACE_AUTORECONF = YES
 

package/lttng-babeltrace/lttng-babeltrace.mk HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info · line 26

Quoted 6 lines

package/lttng-babeltrace/lttng-babeltrace.mk +6 -0

+ifeq ($(BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO),y)
+LTTNG_BABELTRACE_DEPENDENCIES += elfutils
+LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info
+else
+LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info
+endif

Quoted 9 lines

package/lttng-babeltrace/lttng-babeltrace.mk +0 -1

 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
--

2.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 10 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

elfutils (libelf and libdw) can be used by host-lttng-babeltrace. Enable all library dependencies, but don't build the programs.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Philippe Proulx <[email protected]>

---
 package/elfutils/elfutils.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Philippe Proulx <[email protected]>

---
 package/babeltrace/babeltrace.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/babeltrace/babeltrace.mk +0 -0

index d178a6c..17eaaaa 100644

package/babeltrace/babeltrace.mk +0 -1

 # For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
 BABELTRACE_AUTORECONF = YES
--

2.7.4

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Philippe Proulx <[email protected]>

---
 package/babeltrace/babeltrace.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/babeltrace/babeltrace.mk +0 -0

index d178a6c..17eaaaa 100644

Hello,

Quoted 6 lines · Yann E. MORIN

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Philippe Proulx <[email protected]>

---
 package/babeltrace/babeltrace.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/babeltrace/babeltrace.mk BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE · line 15

Quoted 11 lines

package/babeltrace/babeltrace.mk +1 -2

index d178a6c..17eaaaa 100644
@@ -12,8 +12,8 @@ BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
 BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
 BABELTRACE_CONF_OPTS += --disable-debug-info
 HOST_BABELTRACE_DEPENDENCIES = \
-     host-popt host-util-linux host-libglib2 host-pkgconf
-HOST_BABELTRACE_CONF_OPTS += --disable-debug-info
+     host-popt host-util-linux host-libglib2 host-pkgconf host-elfutils

Since the dependency on elfutils is not mandatory, do we really want to force building the support of debug info?

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Quoted 2 lines

Since the dependency on elfutils is not mandatory, do we really want to force building the support of debug info?

Ideally, no. I guess we should use the same strategy as for the target package.

Hello,

Quoted 4 lines · Philippe Proulx

Quoted 2 lines

Since the dependency on elfutils is not mandatory, do we really want to force building the support of debug info?

Ideally, no. I guess we should use the same strategy as for the target package.

Except we don't have Config.in options for host packages, and even if we plan to add such options, we clearly don't want to add *visible* options for every host package.

So for the host-lttng-babeltrace, the only solution would be to have a sub-option to enable debug info support. But that would make it handled differently than the debug info dependency for the target lttng-babeltrace.

I don't really have a good answer here, I'm afraid.

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Philippe Proulx <[email protected]>

---
 package/babeltrace/babeltrace.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

See individual patches for changes.

Philippe Proulx (9):
lttng-libust: bump to version 2.8.1
lttng-libust: enable Python agent when Python is available
lttng-tools: bump to version 2.8.2
lttng-tools: remove dependency on host-lttng-babeltrace
lttng-modules: bump to version 2.8.3
lttng-babeltrace: bump to version 1.4.0
lttng-babeltrace: add host Babeltrace as host utility
lttng-babeltrace: add debug info support
lttng-babeltrace: rename to babeltrace

Philippe, All,

On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:

Quoted 12 lines

See individual patches for changes.

Philippe Proulx (9):
lttng-libust: bump to version 2.8.1
lttng-libust: enable Python agent when Python is available
lttng-tools: bump to version 2.8.2
lttng-tools: remove dependency on host-lttng-babeltrace
lttng-modules: bump to version 2.8.3
lttng-babeltrace: bump to version 1.4.0
lttng-babeltrace: add host Babeltrace as host utility
lttng-babeltrace: add debug info support
lttng-babeltrace: rename to babeltrace

Durng the review, I wanted to check something so I tried to apply th series on top of master. Some of the patches do not apply, but I can't see why:

Description: [v3,3/9] lttng-tools: bump to version 2.8.2
Applying: lttng-tools: bump to version 2.8.2
.git/rebase-apply/patch:117: space before tab in indent.
errno = 0;
.git/rebase-apply/patch:118: space before tab in indent.
id = strtol(argv[1], &name, 10);
.git/rebase-apply/patch:121: space before tab in indent.
ret = del_output(UINT32_MAX, name);
.git/rebase-apply/patch:122: space before tab in indent.
} else if (errno == 0 && *name == '\0') {
.git/rebase-apply/patch:123: space before tab in indent.
ret = del_output(id, NULL);
error: patch failed: package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch:1
error: package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch: patch does not apply
error: patch failed: package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch:1
error: package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch: patch does not apply Patch failed at 0001 lttng-tools: bump to version 2.8.2
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128

So, those patches do not apply:
lttng-tools: bump to version 2.8.2
lttng-babeltrace: bump to version 1.4.0

The failures (in both cases) occur when trying to delete existing
patches, but not for all removals:
package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch

I've had a look at the patches, but they look correct. :-/

Regards,
Yann E. MORIN.

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'