* [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0
@ 2016-10-31 7:46 Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
` (9 more replies)
0 siblings, 10 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: buildroot
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
Config.in.legacy | 8 +
package/Config.in | 2 +-
package/Config.in.host | 1 +
...c-remove-elfutils-version-test-for-Buildr.patch | 30 ++
...b-Makefile.am-remove-unneeded-static-flag.patch | 36 ++
package/{lttng-babeltrace => babeltrace}/Config.in | 35 +-
package/babeltrace/Config.in.host | 18 +
package/babeltrace/babeltrace.hash | 6 +
package/babeltrace/babeltrace.mk | 29 ++
.../0001-no-posix-fallocate-in-uclibc.patch | 37 --
...ix-uuid-support-detection-on-static-build.patch | 63 ---
package/lttng-babeltrace/lttng-babeltrace.hash | 7 -
package/lttng-babeltrace/lttng-babeltrace.mk | 21 -
...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 | 11 +-
package/lttng-modules/lttng-modules.hash | 6 +-
package/lttng-modules/lttng-modules.mk | 3 +-
...ld-failure-when-__GLIBC_PREREQ-is-missing.patch | 55 ---
...Fix-snapshot-del-output-with-name-on-musl.patch | 32 ++
.../0002-Fix-add-missing-sys-types.h-header.patch | 29 --
...Fix-strerror_r-behavior-is-glibc-specific.patch | 30 ++
...et-thread-stack-size-to-ulimit-soft-value.patch | 431 +++++++++++++++++++++
package/lttng-tools/lttng-tools.hash | 6 +-
package/lttng-tools/lttng-tools.mk | 17 +-
25 files changed, 708 insertions(+), 249 deletions(-)
create mode 100644 package/babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
create mode 100644 package/babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
rename package/{lttng-babeltrace => babeltrace}/Config.in (50%)
create mode 100644 package/babeltrace/Config.in.host
create mode 100644 package/babeltrace/babeltrace.hash
create mode 100644 package/babeltrace/babeltrace.mk
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
delete mode 100644 package/lttng-babeltrace/lttng-babeltrace.hash
delete mode 100644 package/lttng-babeltrace/lttng-babeltrace.mk
create mode 100644 package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
delete mode 100644 package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch
create mode 100644 package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch
delete mode 100644 package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch
create mode 100644 package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch
create mode 100644 package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch
--
2.9.3
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
` (8 subsequent siblings)
9 siblings, 2 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: 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 <eeppeliteloop@gmail.com>
---
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
diff --git a/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
new file mode 100644
index 0000000..1788a04
--- /dev/null
+++ b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
@@ -0,0 +1,34 @@
+From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+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 <eeppeliteloop@gmail.com>
+[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
+
diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
index 1494acf..a4a2907 100644
--- a/package/lttng-libust/lttng-libust.hash
+++ b/package/lttng-libust/lttng-libust.hash
@@ -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
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 61ffed4..feeeb43 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
` (7 subsequent siblings)
9 siblings, 2 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: 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 <eeppeliteloop@gmail.com>
---
This is a new patch in v3.
package/lttng-libust/lttng-libust.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index feeeb43..7a83f46 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:16 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
` (6 subsequent siblings)
9 siblings, 2 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: buildroot
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 <eeppeliteloop@gmail.com>
---
Changes v2 -> v3:
- Add links to original patches in patch files.
- Remove the original patch index from the subject of patch files.
Changes v1 -> v2:
- Detailed commit message.
- Complete patches with author and date.
...ld-failure-when-__GLIBC_PREREQ-is-missing.patch | 55 ---
...Fix-snapshot-del-output-with-name-on-musl.patch | 32 ++
| 29 --
...Fix-strerror_r-behavior-is-glibc-specific.patch | 30 ++
...et-thread-stack-size-to-ulimit-soft-value.patch | 431 +++++++++++++++++++++
package/lttng-tools/lttng-tools.hash | 6 +-
package/lttng-tools/lttng-tools.mk | 10 +-
7 files changed, 502 insertions(+), 91 deletions(-)
delete mode 100644 package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch
create mode 100644 package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch
delete mode 100644 package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch
create mode 100644 package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch
create mode 100644 package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch
diff --git a/package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch b/package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch
deleted file mode 100644
index 2c01dea..0000000
--- a/package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 8 Mar 2016 14:25:34 +0200
-Subject: [PATCH] Fix: build failure when __GLIBC_PREREQ is missing
-
-The musl C library does not provide the __GLIBC_PREREQ macro. Instead of
-relying on glibc version test, check directly for the availability of
-epoll_create1().
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: sent upstream rebased on master branch
-(http://lists.lttng.org/pipermail/lttng-dev/2016-March/025593.html)
-
- configure.ac | 2 +-
- src/common/compat/poll.h | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 66d83b60b017..4fc1160c9a08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,7 @@ AC_CHECK_FUNCS([ \
- gethostbyname gethostname getpagesize localtime_r memchr memset \
- mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \
- strncasecmp strndup strpbrk strrchr strstr strtol strtoul \
-- strtoull \
-+ strtoull epoll_create1 \
- ])
-
- # Babeltrace viewer check
-diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
-index 699901848dc1..84f25d5c85aa 100644
---- a/src/common/compat/poll.h
-+++ b/src/common/compat/poll.h
-@@ -73,7 +73,7 @@ enum {
- LPOLLNVAL = EPOLLHUP,
- LPOLLRDHUP = EPOLLRDHUP,
- /* Close on exec feature of epoll */
--#if __GLIBC_PREREQ(2, 9)
-+#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC)
- LTTNG_CLOEXEC = EPOLL_CLOEXEC,
- #else
- /*
-@@ -127,7 +127,7 @@ extern int compat_epoll_create(struct lttng_poll_event *events,
- #define lttng_poll_create(events, size, flags) \
- compat_epoll_create(events, size, flags)
-
--#if __GLIBC_PREREQ(2, 9)
-+#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC)
- static inline int compat_glibc_epoll_create(int size __attribute__((unused)),
- int flags)
- {
---
-2.7.0
-
diff --git a/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch b/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch
new file mode 100644
index 0000000..b8e9e2a
--- /dev/null
+++ b/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch
@@ -0,0 +1,32 @@
+From: mjeanson at efficios.com Michael Jeanson
+Date: Wed, 15 Jun 2016 17:18:02 -0400
+Subject: [lttng-dev] [PATCH] Fix: snapshot del-output with name on musl
+
+Some implementations of strtol() like the one in musl will
+return EINVAL in perror when no valid number was found in
+the string.
+
+Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+[Philippe: grabbed from the mailing list:
+ https://lists.lttng.org/pipermail/lttng-dev/2016-June/026192.html
+]
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+---
+ src/bin/lttng/commands/snapshot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
+index d948226..00aa5b7 100644
+--- a/src/bin/lttng/commands/snapshot.c
++++ b/src/bin/lttng/commands/snapshot.c
+@@ -350,7 +350,7 @@ static int cmd_del_output(int argc, const char **argv)
+
+ errno = 0;
+ id = strtol(argv[1], &name, 10);
+- if (id == 0 && errno == 0) {
++ if (id == 0 && (errno == 0 || errno == EINVAL)) {
+ ret = del_output(UINT32_MAX, name);
+ } else if (errno == 0 && *name == '\0') {
+ ret = del_output(id, NULL);
+--
+2.7.4
diff --git a/package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch b/package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch
deleted file mode 100644
index 5ce2da5..0000000
--- a/package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 8 Mar 2016 14:40:49 +0200
-Subject: [PATCH] Fix: add missing sys/types.h header
-
-The musl C library requires inclusion of sys/types.h for mode_t.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: sent upstream
-(http://lists.lttng.org/pipermail/lttng-dev/2016-March/025594.html)
-
- src/common/runas.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/common/runas.h b/src/common/runas.h
-index 2c5565af3646..ac1143eecf84 100644
---- a/src/common/runas.h
-+++ b/src/common/runas.h
-@@ -19,6 +19,7 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#include <sys/types.h>
- #include <unistd.h>
- #include <pthread.h>
-
---
-2.7.0
-
diff --git a/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch b/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch
new file mode 100644
index 0000000..5608a1e
--- /dev/null
+++ b/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch
@@ -0,0 +1,30 @@
+From fc743b22fc26eab9f9dbf48e4505ed2394924bba Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson@efficios.com>
+Date: Mon, 13 Jun 2016 18:44:17 -0400
+Subject: [PATCH lttng-tools 4/4] Fix: strerror_r behavior is glibc specific
+
+Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+[Philippe: grabbed from the mailing list:
+ https://lists.lttng.org/pipermail/lttng-dev/2016-June/026194.html
+]
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+---
+ src/common/error.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/error.h b/src/common/error.h
+index 0fbd3a2..e8c811e 100644
+--- a/src/common/error.h
++++ b/src/common/error.h
+@@ -198,7 +198,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type)
+
+ #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args)
+
+-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
++#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+
+ /*
+ * Version using XSI strerror_r.
+--
+2.7.4
+
diff --git a/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch b/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch
new file mode 100644
index 0000000..c0dd067
--- /dev/null
+++ b/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch
@@ -0,0 +1,431 @@
+From 451f4d875537c073a966d6ccfb2fe08a497fbd7b Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson@efficios.com>
+Date: Wed, 15 Jun 2016 11:01:08 -0500
+Subject: [PATCH] Set thread stack size to ulimit soft value
+
+Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+[Philippe: grabbed from the mailing list:
+ https://lists.lttng.org/pipermail/lttng-dev/2016-June/026196.html
+]
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+---
+ src/bin/lttng-consumerd/lttng-consumerd.c | 17 ++++++----
+ src/bin/lttng-relayd/live.c | 10 +++---
+ src/bin/lttng-relayd/live.h | 2 +-
+ src/bin/lttng-relayd/main.c | 14 +++++---
+ src/bin/lttng-sessiond/main.c | 27 +++++++++------
+ src/common/utils.c | 56 +++++++++++++++++++++++++++++++
+ src/common/utils.h | 1 +
+ 7 files changed, 99 insertions(+), 28 deletions(-)
+
+diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
+index 00660fc..2f1d01c 100644
+--- a/src/bin/lttng-consumerd/lttng-consumerd.c
++++ b/src/bin/lttng-consumerd/lttng-consumerd.c
+@@ -57,6 +57,8 @@
+ static pthread_t channel_thread, data_thread, metadata_thread,
+ sessiond_thread, metadata_timer_thread, health_thread;
+
++static pthread_attr_t *tattr;
++
+ /* to count the number of times the user pressed ctrl+c */
+ static int sigintcount = 0;
+
+@@ -351,6 +353,9 @@ int main(int argc, char **argv)
+ }
+ }
+
++ /* Get stacksize limit */
++ tattr = get_pthread_attr_stacksize();
++
+ /*
+ * Starting from here, we can create threads. This needs to be after
+ * lttng_daemonize due to RCU.
+@@ -498,7 +503,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage the client socket */
+- ret = pthread_create(&health_thread, NULL,
++ ret = pthread_create(&health_thread, tattr,
+ thread_manage_health, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -517,7 +522,7 @@ int main(int argc, char **argv)
+ cmm_smp_mb(); /* Read ready before following operations */
+
+ /* Create thread to manage channels */
+- ret = pthread_create(&channel_thread, NULL,
++ ret = pthread_create(&channel_thread, tattr,
+ consumer_thread_channel_poll,
+ (void *) ctx);
+ if (ret) {
+@@ -528,7 +533,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage the polling/writing of trace metadata */
+- ret = pthread_create(&metadata_thread, NULL,
++ ret = pthread_create(&metadata_thread, tattr,
+ consumer_thread_metadata_poll,
+ (void *) ctx);
+ if (ret) {
+@@ -539,7 +544,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage the polling/writing of trace data */
+- ret = pthread_create(&data_thread, NULL, consumer_thread_data_poll,
++ ret = pthread_create(&data_thread, tattr, consumer_thread_data_poll,
+ (void *) ctx);
+ if (ret) {
+ errno = ret;
+@@ -549,7 +554,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create the thread to manage the receive of fd */
+- ret = pthread_create(&sessiond_thread, NULL,
++ ret = pthread_create(&sessiond_thread, tattr,
+ consumer_thread_sessiond_poll,
+ (void *) ctx);
+ if (ret) {
+@@ -563,7 +568,7 @@ int main(int argc, char **argv)
+ * Create the thread to manage the UST metadata periodic timer and
+ * live timer.
+ */
+- ret = pthread_create(&metadata_timer_thread, NULL,
++ ret = pthread_create(&metadata_timer_thread, tattr,
+ consumer_timer_thread, (void *) ctx);
+ if (ret) {
+ errno = ret;
+diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
+index e2096ec..32efab1 100644
+--- a/src/bin/lttng-relayd/live.c
++++ b/src/bin/lttng-relayd/live.c
+@@ -2147,13 +2147,13 @@ int relayd_live_join(void)
+ /*
+ * main
+ */
+-int relayd_live_create(struct lttng_uri *uri)
++int relayd_live_create(struct lttng_uri *uri, const pthread_attr_t *tattr)
+ {
+ int ret = 0, retval = 0;
+ void *status;
+ int is_root;
+
+- if (!uri) {
++ if (!uri || !tattr) {
+ retval = -1;
+ goto exit_init_data;
+ }
+@@ -2186,7 +2186,7 @@ int relayd_live_create(struct lttng_uri *uri)
+ }
+
+ /* Setup the dispatcher thread */
+- ret = pthread_create(&live_dispatcher_thread, NULL,
++ ret = pthread_create(&live_dispatcher_thread, tattr,
+ thread_dispatcher, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -2196,7 +2196,7 @@ int relayd_live_create(struct lttng_uri *uri)
+ }
+
+ /* Setup the worker thread */
+- ret = pthread_create(&live_worker_thread, NULL,
++ ret = pthread_create(&live_worker_thread, tattr,
+ thread_worker, NULL);
+ if (ret) {
+ errno = ret;
+@@ -2206,7 +2206,7 @@ int relayd_live_create(struct lttng_uri *uri)
+ }
+
+ /* Setup the listener thread */
+- ret = pthread_create(&live_listener_thread, NULL,
++ ret = pthread_create(&live_listener_thread, tattr,
+ thread_listener, (void *) NULL);
+ if (ret) {
+ errno = ret;
+diff --git a/src/bin/lttng-relayd/live.h b/src/bin/lttng-relayd/live.h
+index 2b8a3a0..6cd85e9 100644
+--- a/src/bin/lttng-relayd/live.h
++++ b/src/bin/lttng-relayd/live.h
+@@ -24,7 +24,7 @@
+
+ #include "lttng-relayd.h"
+
+-int relayd_live_create(struct lttng_uri *live_uri);
++int relayd_live_create(struct lttng_uri *live_uri, const pthread_attr_t *tattr);
+ int relayd_live_stop(void);
+ int relayd_live_join(void);
+
+diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
+index 6ad6566..505e884 100644
+--- a/src/bin/lttng-relayd/main.c
++++ b/src/bin/lttng-relayd/main.c
+@@ -119,6 +119,8 @@ static pthread_t dispatcher_thread;
+ static pthread_t worker_thread;
+ static pthread_t health_thread;
+
++static pthread_attr_t *tattr;
++
+ /*
+ * last_relay_stream_id_lock protects last_relay_stream_id increment
+ * atomicity on 32-bit architectures.
+@@ -2778,6 +2780,8 @@ int main(int argc, char **argv)
+ }
+ }
+
++ /* Get stack size limit */
++ tattr = get_pthread_attr_stacksize();
+
+ /* Initialize thread health monitoring */
+ health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
+@@ -2840,7 +2844,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage the client socket */
+- ret = pthread_create(&health_thread, NULL,
++ ret = pthread_create(&health_thread, tattr,
+ thread_manage_health, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -2850,7 +2854,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Setup the dispatcher thread */
+- ret = pthread_create(&dispatcher_thread, NULL,
++ ret = pthread_create(&dispatcher_thread, tattr,
+ relay_thread_dispatcher, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -2860,7 +2864,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Setup the worker thread */
+- ret = pthread_create(&worker_thread, NULL,
++ ret = pthread_create(&worker_thread, tattr,
+ relay_thread_worker, NULL);
+ if (ret) {
+ errno = ret;
+@@ -2870,7 +2874,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Setup the listener thread */
+- ret = pthread_create(&listener_thread, NULL,
++ ret = pthread_create(&listener_thread, tattr,
+ relay_thread_listener, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -2879,7 +2883,7 @@ int main(int argc, char **argv)
+ goto exit_listener_thread;
+ }
+
+- ret = relayd_live_create(live_uri);
++ ret = relayd_live_create(live_uri, tattr);
+ if (ret) {
+ ERR("Starting live viewer threads");
+ retval = -1;
+diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
+index c8e4e53..b8f1bde 100644
+--- a/src/bin/lttng-sessiond/main.c
++++ b/src/bin/lttng-sessiond/main.c
+@@ -212,6 +212,8 @@ static pthread_t ht_cleanup_thread;
+ static pthread_t agent_reg_thread;
+ static pthread_t load_session_thread;
+
++static pthread_attr_t *tattr;
++
+ /*
+ * UST registration command queue. This queue is tied with a futex and uses a N
+ * wakers / 1 waiter implemented and detailed in futex.c/.h
+@@ -2402,7 +2404,7 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data)
+ goto error;
+ }
+
+- ret = pthread_create(&consumer_data->thread, NULL, thread_manage_consumer,
++ ret = pthread_create(&consumer_data->thread, tattr, thread_manage_consumer,
+ consumer_data);
+ if (ret) {
+ errno = ret;
+@@ -5638,6 +5640,9 @@ int main(int argc, char **argv)
+ goto exit_create_run_as_worker_cleanup;
+ }
+
++ /* Get stack size limit */
++ tattr = get_pthread_attr_stacksize();
++
+ /*
+ * Starting from here, we can create threads. This needs to be after
+ * lttng_daemonize due to RCU.
+@@ -5672,7 +5677,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to clean up RCU hash tables */
+- ret = pthread_create(&ht_cleanup_thread, NULL,
++ ret = pthread_create(&ht_cleanup_thread, tattr,
+ thread_ht_cleanup, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6044,7 +6049,7 @@ int main(int argc, char **argv)
+ load_info->path = opt_load_session_path;
+
+ /* Create health-check thread */
+- ret = pthread_create(&health_thread, NULL,
++ ret = pthread_create(&health_thread, tattr,
+ thread_manage_health, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6054,7 +6059,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage the client socket */
+- ret = pthread_create(&client_thread, NULL,
++ ret = pthread_create(&client_thread, tattr,
+ thread_manage_clients, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6064,7 +6069,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to dispatch registration */
+- ret = pthread_create(&dispatch_thread, NULL,
++ ret = pthread_create(&dispatch_thread, tattr,
+ thread_dispatch_ust_registration, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6074,7 +6079,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage application registration. */
+- ret = pthread_create(®_apps_thread, NULL,
++ ret = pthread_create(®_apps_thread, tattr,
+ thread_registration_apps, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6084,7 +6089,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage application socket */
+- ret = pthread_create(&apps_thread, NULL,
++ ret = pthread_create(&apps_thread, tattr,
+ thread_manage_apps, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6094,7 +6099,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create thread to manage application notify socket */
+- ret = pthread_create(&apps_notify_thread, NULL,
++ ret = pthread_create(&apps_notify_thread, tattr,
+ ust_thread_manage_notify, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6104,7 +6109,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create agent registration thread. */
+- ret = pthread_create(&agent_reg_thread, NULL,
++ ret = pthread_create(&agent_reg_thread, tattr,
+ agent_thread_manage_registration, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6116,7 +6121,7 @@ int main(int argc, char **argv)
+ /* Don't start this thread if kernel tracing is not requested nor root */
+ if (is_root && !opt_no_kernel) {
+ /* Create kernel thread to manage kernel event */
+- ret = pthread_create(&kernel_thread, NULL,
++ ret = pthread_create(&kernel_thread, tattr,
+ thread_manage_kernel, (void *) NULL);
+ if (ret) {
+ errno = ret;
+@@ -6127,7 +6132,7 @@ int main(int argc, char **argv)
+ }
+
+ /* Create session loading thread. */
+- ret = pthread_create(&load_session_thread, NULL, thread_load_session,
++ ret = pthread_create(&load_session_thread, tattr, thread_load_session,
+ load_info);
+ if (ret) {
+ errno = ret;
+diff --git a/src/common/utils.c b/src/common/utils.c
+index 1e52ae0..593d6cc 100644
+--- a/src/common/utils.c
++++ b/src/common/utils.c
+@@ -31,6 +31,8 @@
+ #include <pwd.h>
+ #include <sys/file.h>
+ #include <unistd.h>
++#include <stdbool.h>
++#include <sys/resource.h>
+
+ #include <common/common.h>
+ #include <common/runas.h>
+@@ -1383,3 +1385,57 @@ int utils_show_man_page(int section, const char *page_name)
+ section_string, page_name, NULL);
+ return ret;
+ }
++
++static bool pthread_ss_done = false;
++static pthread_attr_t *tattr = NULL;
++static pthread_attr_t tattr_value;
++
++LTTNG_HIDDEN
++pthread_attr_t *get_pthread_attr_stacksize() {
++ int ret = 0;
++ size_t ptstacksize;
++ struct rlimit rlim;
++
++ /* Return cached value */
++ if (pthread_ss_done) {
++ goto end;
++ }
++
++ /* Get stack size limits */
++ ret = getrlimit(RLIMIT_STACK, &rlim);
++ if (ret < 0) {
++ PERROR("getrlimit");
++ goto end;
++ }
++ DBG("Stack size limits: soft %lld, hard %lld bytes",
++ (long long) rlim.rlim_cur,
++ (long long) rlim.rlim_max);
++
++ /* Get default thread stack size */
++ ret = pthread_attr_getstacksize(&tattr_value, &ptstacksize);
++ if (ret < 0) {
++ PERROR("pthread_attr_getstacksize");
++ goto end;
++ }
++ DBG("Default pthread stack size is %zu bytes", ptstacksize);
++
++ /* Check if default thread stack size respects ulimits */
++ if (ptstacksize < rlim.rlim_cur) {
++ DBG("Your libc doesn't honor stack size limits, setting thread stack size to soft limit (%lld bytes)", (long long) rlim.rlim_cur);
++
++ /* Create pthread_attr_t struct with ulimit stack size */
++ ret = pthread_attr_setstacksize(&tattr_value, rlim.rlim_cur);
++ if (ret < 0) {
++ PERROR("pthread_attr_setstacksize");
++ goto end;
++ }
++
++ /* Set pointer */
++ tattr = &tattr_value;
++ }
++
++ /* Enable cached value */
++ pthread_ss_done = true;
++end:
++ return tattr;
++}
+diff --git a/src/common/utils.h b/src/common/utils.h
+index 7285f5c..568c123 100644
+--- a/src/common/utils.h
++++ b/src/common/utils.h
+@@ -60,5 +60,6 @@ int utils_create_lock_file(const char *filepath);
+ int utils_recursive_rmdir(const char *path);
+ int utils_truncate_stream_file(int fd, off_t length);
+ int utils_show_man_page(int section, const char *page_name);
++pthread_attr_t *get_pthread_attr_stacksize();
+
+ #endif /* _COMMON_UTILS_H */
+--
+2.7.4
+
diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash
index f05b0e3..267da80 100644
--- a/package/lttng-tools/lttng-tools.hash
+++ b/package/lttng-tools/lttng-tools.hash
@@ -1,2 +1,6 @@
+# From http://lttng.org/files/lttng-tools/lttng-tools-2.8.2.tar.bz2.{md5,sha1}
+md5 cac8d64111711ae1b632d0dc12fe92c1 lttng-tools-2.8.2.tar.bz2
+sha1 870874ba9644691de8e564a1fa1459aa5fef42ba lttng-tools-2.8.2.tar.bz2
+
# Locally generated
-sha256 0c799fb21dfa42475feaa1507ded934608b2e531039b46c40e944a5b81c7b21c lttng-tools-2.7.1.tar.bz2
+sha256 a07e00e9519dad2577d9330bcaf040ab3dc1b289fbcb8c702c39d520422e7565 lttng-tools-2.8.2.tar.bz2
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index e5b1207..3d884d3 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -4,14 +4,12 @@
#
################################################################################
-LTTNG_TOOLS_VERSION = 2.7.1
+LTTNG_TOOLS_VERSION = 2.8.2
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+ (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
-# Patching configure.ac
-LTTNG_TOOLS_AUTORECONF = YES
+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
@@ -20,10 +18,10 @@ LTTNG_TOOLS_AUTORECONF = YES
LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt host-lttng-babeltrace util-linux
ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
-LTTNG_TOOLS_CONF_OPTS += --enable-lttng-ust
+LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust
LTTNG_TOOLS_DEPENDENCIES += lttng-libust
else
-LTTNG_TOOLS_CONF_OPTS += --disable-lttng-ust
+LTTNG_TOOLS_CONF_OPTS += --without-lttng-ust
endif
$(eval $(autotools-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (2 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:26 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3 Philippe Proulx
` (5 subsequent siblings)
9 siblings, 2 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: 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 <eeppeliteloop@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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(-)
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 3d884d3..9d9cb1c 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (3 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 9:57 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
` (4 subsequent siblings)
9 siblings, 1 reply; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: buildroot
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 <eeppeliteloop@gmail.com>
---
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(-)
diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash
index 2d50287..81e2d5c 100644
--- a/package/lttng-modules/lttng-modules.hash
+++ b/package/lttng-modules/lttng-modules.hash
@@ -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
+
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index 5d0c422..9ecf572 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (4 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3 Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 10:12 ` Yann E. MORIN
2016-11-01 14:30 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility Philippe Proulx
` (3 subsequent siblings)
9 siblings, 2 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: 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 <eeppeliteloop@gmail.com>
---
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
diff --git a/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
new file mode 100644
index 0000000..831a04c
--- /dev/null
+++ b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
@@ -0,0 +1,30 @@
+From d3cce60dfde30bd2fd67caa3fbc5f111131c243a Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+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 <eeppeliteloop@gmail.com>
+---
+ 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
+
diff --git a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
deleted file mode 100644
index d77825f..0000000
--- a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
+++ /dev/null
@@ -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 <thomas.petazzoni@free-electrons.com>
-[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:
diff --git a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch b/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
deleted file mode 100644
index 849c0a3..0000000
--- a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-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 <s.martin49@gmail.com>
----
- 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
-
diff --git a/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
new file mode 100644
index 0000000..b903d87
--- /dev/null
+++ b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
@@ -0,0 +1,36 @@
+From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+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 <eeppeliteloop@gmail.com>
+[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
+
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index d362779..2e8d778 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -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
diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/lttng-babeltrace/lttng-babeltrace.hash
index a9f45b2..bca0bdb 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.hash
+++ b/package/lttng-babeltrace/lttng-babeltrace.hash
@@ -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
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index b2e03a9..da18f88 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (5 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 10:14 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support Philippe Proulx
` (2 subsequent siblings)
9 siblings, 1 reply; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: buildroot
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 <eeppeliteloop@gmail.com>
---
This is a new patch in v3.
package/Config.in.host | 1 +
package/lttng-babeltrace/Config.in | 6 ++++--
package/lttng-babeltrace/Config.in.host | 18 ++++++++++++++++++
package/lttng-babeltrace/lttng-babeltrace.mk | 1 +
4 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 package/lttng-babeltrace/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index e33cbb5..3b115c5 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -22,6 +22,7 @@ menu "Host utilities"
source "package/jq/Config.in.host"
source "package/jsmin/Config.in.host"
source "package/lpc3250loader/Config.in.host"
+ source "package/lttng-babeltrace/Config.in.host"
source "package/mfgtools/Config.in.host"
source "package/mke2img/Config.in.host"
source "package/mkpasswd/Config.in.host"
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 2e8d778..95b635d 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -20,8 +20,10 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
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. Babeltrace
- is packaged for all major Linux distributions.
+ development workstation, and use babeltrace here.
+
+ See the lttng-babeltrace host utility to install Babeltrace
+ on the host.
http://diamon.org/babeltrace
diff --git a/package/lttng-babeltrace/Config.in.host b/package/lttng-babeltrace/Config.in.host
new file mode 100644
index 0000000..5da482e
--- /dev/null
+++ b/package/lttng-babeltrace/Config.in.host
@@ -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
+ 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.
+
+ http://diamon.org/babeltrace
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index da18f88..30c5f6e 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (6 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 11:24 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
2016-10-31 10:39 ` [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Yann E. MORIN
9 siblings, 1 reply; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: buildroot
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 <eeppeliteloop@gmail.com>
---
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(+)
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 95b635d..55e2143 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -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
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 30c5f6e..260a8ee 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (7 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support Philippe Proulx
@ 2016-10-31 7:46 ` Philippe Proulx
2016-10-31 12:48 ` [Buildroot] [PATCH 1/2] package/elfutils: add host variant Yann E. MORIN
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
2016-10-31 10:39 ` [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Yann E. MORIN
9 siblings, 2 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 7:46 UTC (permalink / raw)
To: buildroot
The Babeltrace project is no longer part of the LTTng project.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
This is a new patch in v3.
Config.in.legacy | 8 ++++++
package/Config.in | 2 +-
package/Config.in.host | 2 +-
...c-remove-elfutils-version-test-for-Buildr.patch | 0
...b-Makefile.am-remove-unneeded-static-flag.patch | 0
package/{lttng-babeltrace => babeltrace}/Config.in | 12 ++++-----
.../Config.in.host | 4 +--
.../babeltrace.hash} | 0
package/babeltrace/babeltrace.mk | 29 ++++++++++++++++++++++
package/lttng-babeltrace/lttng-babeltrace.mk | 29 ----------------------
10 files changed, 47 insertions(+), 39 deletions(-)
rename package/{lttng-babeltrace => babeltrace}/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch (100%)
rename package/{lttng-babeltrace => babeltrace}/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch (100%)
rename package/{lttng-babeltrace => babeltrace}/Config.in (84%)
rename package/{lttng-babeltrace => babeltrace}/Config.in.host (90%)
rename package/{lttng-babeltrace/lttng-babeltrace.hash => babeltrace/babeltrace.hash} (100%)
create mode 100644 package/babeltrace/babeltrace.mk
delete mode 100644 package/lttng-babeltrace/lttng-babeltrace.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 8c41b05..d5ec061 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,14 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_LTTNG_BABELTRACE
+ bool "lttng-babeltrace has been renamed to babeltrace"
+ select BR2_PACKAGE_BABELTRACE
+ select BR2_LEGACY
+ help
+ The lttng-babeltrace package has been renamed to match the
+ project's name (separate from the LTTng project now).
+
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
bool "PHP CGI and CLI options are now seperate"
select BR2_PACKAGE_PHP_SAPI_CLI
diff --git a/package/Config.in b/package/Config.in
index 0f6260b..b61e95b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -67,6 +67,7 @@ menu "Compressors and decompressors"
endmenu
menu "Debugging, profiling and benchmark"
+ source "package/babeltrace/Config.in"
source "package/blktrace/Config.in"
source "package/bonnie/Config.in"
source "package/cache-calibrator/Config.in"
@@ -91,7 +92,6 @@ menu "Debugging, profiling and benchmark"
source "package/lsof/Config.in"
source "package/ltp-testsuite/Config.in"
source "package/ltrace/Config.in"
- source "package/lttng-babeltrace/Config.in"
source "package/lttng-modules/Config.in"
source "package/lttng-tools/Config.in"
source "package/mcelog/Config.in"
diff --git a/package/Config.in.host b/package/Config.in.host
index 3b115c5..1bcd24c 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -2,6 +2,7 @@ menu "Host utilities"
source "package/aespipe/Config.in.host"
source "package/android-tools/Config.in.host"
+ source "package/babeltrace/Config.in.host"
source "package/cbootimage/Config.in.host"
source "package/checkpolicy/Config.in.host"
source "package/cramfs/Config.in.host"
@@ -22,7 +23,6 @@ menu "Host utilities"
source "package/jq/Config.in.host"
source "package/jsmin/Config.in.host"
source "package/lpc3250loader/Config.in.host"
- source "package/lttng-babeltrace/Config.in.host"
source "package/mfgtools/Config.in.host"
source "package/mke2img/Config.in.host"
source "package/mkpasswd/Config.in.host"
diff --git a/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch b/package/babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
similarity index 100%
rename from package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
rename to package/babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
diff --git a/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
similarity index 100%
rename from package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
rename to package/babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
diff --git a/package/lttng-babeltrace/Config.in b/package/babeltrace/Config.in
similarity index 84%
rename from package/lttng-babeltrace/Config.in
rename to package/babeltrace/Config.in
index 55e2143..82a8c8c 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/babeltrace/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_LTTNG_BABELTRACE
- bool "lttng-babeltrace"
+config BR2_PACKAGE_BABELTRACE
+ bool "babeltrace"
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_LIBGLIB2
@@ -22,14 +22,14 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
transfer the binary trace output from the target to your
development workstation, and use babeltrace here.
- See the lttng-babeltrace host utility to install Babeltrace
+ See the babeltrace host utility to install Babeltrace
on the host.
http://diamon.org/babeltrace
-if BR2_PACKAGE_LTTNG_BABELTRACE
+if BR2_PACKAGE_BABELTRACE
-config BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO
+config BR2_PACKAGE_BABELTRACE_DEBUG_INFO
bool
default y
depends on !BR2_bfin # elfutils
@@ -44,6 +44,6 @@ comment "handling debug info in traces needs a glibc or uClibc toolchain w/ dyna
endif
-comment "lttng-babeltrace needs a toolchain w/ wchar, threads"
+comment "babeltrace needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-babeltrace/Config.in.host b/package/babeltrace/Config.in.host
similarity index 90%
rename from package/lttng-babeltrace/Config.in.host
rename to package/babeltrace/Config.in.host
index 5da482e..be4cebe 100644
--- a/package/lttng-babeltrace/Config.in.host
+++ b/package/babeltrace/Config.in.host
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_HOST_LTTNG_BABELTRACE
- bool "host lttng-babeltrace"
+config BR2_PACKAGE_HOST_BABELTRACE
+ bool "host babeltrace"
help
The Babeltrace project provides trace read and write
libraries, as well as a trace converter application. Plugins
diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/babeltrace/babeltrace.hash
similarity index 100%
rename from package/lttng-babeltrace/lttng-babeltrace.hash
rename to package/babeltrace/babeltrace.hash
diff --git a/package/babeltrace/babeltrace.mk b/package/babeltrace/babeltrace.mk
new file mode 100644
index 0000000..d178a6c
--- /dev/null
+++ b/package/babeltrace/babeltrace.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# babeltrace
+#
+################################################################################
+
+BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
+BABELTRACE_VERSION = 1.4.0
+BABELTRACE_SOURCE = babeltrace-$(BABELTRACE_VERSION).tar.bz2
+BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
+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
+
+# For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
+BABELTRACE_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_BABELTRACE_DEBUG_INFO),y)
+BABELTRACE_DEPENDENCIES += elfutils
+BABELTRACE_CONF_OPTS += --enable-debug-info
+else
+BABELTRACE_CONF_OPTS += --disable-debug-info
+endif
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
deleted file mode 100644
index 260a8ee..0000000
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-# lttng-babeltrace
-#
-################################################################################
-
-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
-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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
@ 2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 9:42 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> 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
>
> diff --git a/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
> new file mode 100644
> index 0000000..1788a04
> --- /dev/null
> +++ b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
> @@ -0,0 +1,34 @@
> +From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
> +From: Philippe Proulx <eeppeliteloop@gmail.com>
> +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 <eeppeliteloop@gmail.com>
> +[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
> +
> diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
> index 1494acf..a4a2907 100644
> --- a/package/lttng-libust/lttng-libust.hash
> +++ b/package/lttng-libust/lttng-libust.hash
> @@ -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
> diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
> index 61ffed4..feeeb43 100644
> --- a/package/lttng-libust/lttng-libust.mk
> +++ b/package/lttng-libust/lttng-libust.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
@ 2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 9:42 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> This is a new patch in v3.
>
> package/lttng-libust/lttng-libust.mk | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
> index feeeb43..7a83f46 100644
> --- a/package/lttng-libust/lttng-libust.mk
> +++ b/package/lttng-libust/lttng-libust.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
@ 2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:16 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 9:55 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> Changes v2 -> v3:
> - Add links to original patches in patch files.
> - Remove the original patch index from the subject of patch files.
You forgot to remove it for one patch:
> +Subject: [PATCH lttng-tools 4/4] Fix: strerror_r behavior is glibc specific
But that's not too much a problem.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
@ 2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:26 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 9:55 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> 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(-)
>
> diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
> index 3d884d3..9d9cb1c 100644
> --- a/package/lttng-tools/lttng-tools.mk
> +++ b/package/lttng-tools/lttng-tools.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3
2016-10-31 7:46 ` [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3 Philippe Proulx
@ 2016-10-31 9:57 ` Yann E. MORIN
0 siblings, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 9:57 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> 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(-)
>
> diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash
> index 2d50287..81e2d5c 100644
> --- a/package/lttng-modules/lttng-modules.hash
> +++ b/package/lttng-modules/lttng-modules.hash
> @@ -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
> +
> diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
> index 5d0c422..9ecf572 100644
> --- a/package/lttng-modules/lttng-modules.mk
> +++ b/package/lttng-modules/lttng-modules.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
@ 2016-10-31 10:12 ` Yann E. MORIN
2016-11-01 14:30 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 10:12 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> 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
>
> diff --git a/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
> new file mode 100644
> index 0000000..831a04c
> --- /dev/null
> +++ b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
> @@ -0,0 +1,30 @@
> +From d3cce60dfde30bd2fd67caa3fbc5f111131c243a Mon Sep 17 00:00:00 2001
> +From: Philippe Proulx <eeppeliteloop@gmail.com>
> +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 <eeppeliteloop@gmail.com>
> +---
> + 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
> +
> diff --git a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
> deleted file mode 100644
> index d77825f..0000000
> --- a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
> +++ /dev/null
> @@ -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 <thomas.petazzoni@free-electrons.com>
> -[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:
> diff --git a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch b/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
> deleted file mode 100644
> index 849c0a3..0000000
> --- a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001
> -From: Samuel Martin <s.martin49@gmail.com>
> -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 <s.martin49@gmail.com>
> ----
> - 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
> -
> diff --git a/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
> new file mode 100644
> index 0000000..b903d87
> --- /dev/null
> +++ b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
> @@ -0,0 +1,36 @@
> +From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001
> +From: Philippe Proulx <eeppeliteloop@gmail.com>
> +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 <eeppeliteloop@gmail.com>
> +[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
> +
> diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
> index d362779..2e8d778 100644
> --- a/package/lttng-babeltrace/Config.in
> +++ b/package/lttng-babeltrace/Config.in
> @@ -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
> diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/lttng-babeltrace/lttng-babeltrace.hash
> index a9f45b2..bca0bdb 100644
> --- a/package/lttng-babeltrace/lttng-babeltrace.hash
> +++ b/package/lttng-babeltrace/lttng-babeltrace.hash
> @@ -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
> diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
> index b2e03a9..da18f88 100644
> --- a/package/lttng-babeltrace/lttng-babeltrace.mk
> +++ b/package/lttng-babeltrace/lttng-babeltrace.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility
2016-10-31 7:46 ` [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility Philippe Proulx
@ 2016-10-31 10:14 ` Yann E. MORIN
2016-10-31 16:39 ` Philippe Proulx
0 siblings, 1 reply; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 10:14 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
However, small nit, see below...
[--SNIP--]
> diff --git a/package/lttng-babeltrace/Config.in.host b/package/lttng-babeltrace/Config.in.host
> new file mode 100644
> index 0000000..5da482e
> --- /dev/null
> +++ b/package/lttng-babeltrace/Config.in.host
> @@ -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
> + 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.
> + http://diamon.org/babeltrace
> diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
> index da18f88..30c5f6e 100644
> --- a/package/lttng-babeltrace/lttng-babeltrace.mk
> +++ b/package/lttng-babeltrace/lttng-babeltrace.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
` (8 preceding siblings ...)
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
@ 2016-10-31 10:39 ` Yann E. MORIN
2016-10-31 16:42 ` Philippe Proulx
9 siblings, 1 reply; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 10:39 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support
2016-10-31 7:46 ` [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support Philippe Proulx
@ 2016-10-31 11:24 ` Yann E. MORIN
2016-10-31 12:43 ` Yann E. MORIN
0 siblings, 1 reply; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 11:24 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> 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 <eeppeliteloop@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
But then you do not enable debug info for the host variant. That's
because elfutils does not have a host variant. I'll send a patch
shortly.
Regards,
Yann E. MORIN.
> ---
> 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(+)
>
> diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
> index 95b635d..55e2143 100644
> --- a/package/lttng-babeltrace/Config.in
> +++ b/package/lttng-babeltrace/Config.in
> @@ -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
> diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
> index 30c5f6e..260a8ee 100644
> --- a/package/lttng-babeltrace/lttng-babeltrace.mk
> +++ b/package/lttng-babeltrace/lttng-babeltrace.mk
> @@ -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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support
2016-10-31 11:24 ` Yann E. MORIN
@ 2016-10-31 12:43 ` Yann E. MORIN
0 siblings, 0 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 12:43 UTC (permalink / raw)
To: buildroot
Philippe, All,
On 2016-10-31 12:24 +0100, Yann E. MORIN spake thusly:
> On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> > 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 <eeppeliteloop@gmail.com>
[--SNIP--]
> > diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
> > index 30c5f6e..260a8ee 100644
> > --- a/package/lttng-babeltrace/lttng-babeltrace.mk
> > +++ b/package/lttng-babeltrace/lttng-babeltrace.mk
> > @@ -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
But you forgot to remove the unconditional one on line 13.
Regards,
Yann E. MORIN.
> > $(eval $(autotools-package))
> > $(eval $(host-autotools-package))
> > --
> > 2.9.3
> >
> > _______________________________________________
> > 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. |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 1/2] package/elfutils: add host variant
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
@ 2016-10-31 12:48 ` Yann E. MORIN
2016-12-13 23:02 ` Thomas Petazzoni
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
1 sibling, 1 reply; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 12:48 UTC (permalink / raw)
To: 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" <yann.morin.1998@free.fr>
Cc: Philippe Proulx <eeppeliteloop@gmail.com>
---
package/elfutils/elfutils.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 9485d3b..566e0bf 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -11,9 +11,11 @@ ELFUTILS_INSTALL_STAGING = YES
ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library)
ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3
ELFUTILS_DEPENDENCIES = zlib
+HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz
# We patch configure.ac
ELFUTILS_AUTORECONF = YES
+HOST_ELFUTILS_AUTORECONF = YES
# Pass a custom program prefix to avoid a naming conflict between
# elfutils binaries and binutils binaries.
@@ -21,6 +23,12 @@ ELFUTILS_CONF_OPTS += \
--disable-werror \
--program-prefix="eu-"
+HOST_ELFUTILS_CONF_OPTS = \
+ --disable-werror \
+ --with-bzlib \
+ --with-lzma \
+ --disable-progs
+
# elfutils gets confused when lfs mode is forced, so don't
ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))
ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))
@@ -73,3 +81,4 @@ ELFUTILS_CONF_OPTS += --disable-progs
endif
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
2.7.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
2016-10-31 12:48 ` [Buildroot] [PATCH 1/2] package/elfutils: add host variant Yann E. MORIN
@ 2016-10-31 12:48 ` Yann E. MORIN
2016-10-31 16:36 ` Philippe Proulx
` (2 more replies)
1 sibling, 3 replies; 36+ messages in thread
From: Yann E. MORIN @ 2016-10-31 12:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Philippe Proulx <eeppeliteloop@gmail.com>
---
package/babeltrace/babeltrace.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/babeltrace/babeltrace.mk b/package/babeltrace/babeltrace.mk
index d178a6c..17eaaaa 100644
--- a/package/babeltrace/babeltrace.mk
+++ b/package/babeltrace/babeltrace.mk
@@ -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
+HOST_BABELTRACE_CONF_OPTS += --ensable-debug-info
# For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
BABELTRACE_AUTORECONF = YES
--
2.7.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
@ 2016-10-31 16:36 ` Philippe Proulx
2016-11-02 22:29 ` Thomas Petazzoni
2016-12-13 23:03 ` Thomas Petazzoni
2 siblings, 0 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 16:36 UTC (permalink / raw)
To: buildroot
On Mon, Oct 31, 2016 at 8:48 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Philippe Proulx <eeppeliteloop@gmail.com>
> ---
> package/babeltrace/babeltrace.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/babeltrace/babeltrace.mk b/package/babeltrace/babeltrace.mk
> index d178a6c..17eaaaa 100644
> --- a/package/babeltrace/babeltrace.mk
> +++ b/package/babeltrace/babeltrace.mk
> @@ -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
> +HOST_BABELTRACE_CONF_OPTS += --ensable-debug-info
Oops!
>
> # For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch
> BABELTRACE_AUTORECONF = YES
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility
2016-10-31 10:14 ` Yann E. MORIN
@ 2016-10-31 16:39 ` Philippe Proulx
0 siblings, 0 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 16:39 UTC (permalink / raw)
To: buildroot
On Mon, Oct 31, 2016 at 6:14 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Philippe, All,
>
> On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
>> 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 <eeppeliteloop@gmail.com>
>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> However, small nit, see below...
>
> [--SNIP--]
>> diff --git a/package/lttng-babeltrace/Config.in.host b/package/lttng-babeltrace/Config.in.host
>> new file mode 100644
>> index 0000000..5da482e
>> --- /dev/null
>> +++ b/package/lttng-babeltrace/Config.in.host
>> @@ -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
>> + 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.
If the committer wants to do it, I agree.
Phil
>
> Regards,
> Yann E. MORIN.
>
>> + http://diamon.org/babeltrace
>> diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
>> index da18f88..30c5f6e 100644
>> --- a/package/lttng-babeltrace/lttng-babeltrace.mk
>> +++ b/package/lttng-babeltrace/lttng-babeltrace.mk
>> @@ -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
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | 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. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0
2016-10-31 10:39 ` [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Yann E. MORIN
@ 2016-10-31 16:42 ` Philippe Proulx
0 siblings, 0 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-10-31 16:42 UTC (permalink / raw)
To: buildroot
On Mon, Oct 31, 2016 at 6:39 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Philippe, All,
>
> On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
>> 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. :-/
I suspect my text editor removed some trailing whitespaces, but I'm
not sure. I can try to disable trailing whitespace removal, and submit a
v4, or the committer can remove those 3 files manually, as you wish.
Phil
>
> 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. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
@ 2016-11-01 14:16 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-01 14:16 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 03:46:18 -0400, Philippe Proulx wrote:
> 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 <eeppeliteloop@gmail.com>
I'm sorry, but this patch does not apply:
thomas at skate:~/projets/buildroot (master)$ curl https://patchwork.ozlabs.org/patch/689224/mbox/ | git am -3 -s
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 24585 0 24585 0 0 9319 0 --:--:-- 0:00:02 --:--:-- 9319
Applying: lttng-tools: bump to version 2.8.2
Using index info to reconstruct a base tree...
.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
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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".
So I fixed up the things myself, by removing the existing patches in
package/lttng-tools/, and then applying your patches without the hunks
removing the old patches. It then applied cleanly, but makes the build
of lttng-tools build fail because the new patches don't apply at all:
>>> lttng-tools 2.8.2 Extracting
bzcat /home/thomas/dl/lttng-tools-2.8.2.tar.bz2 | tar --strip-components=1 -C /home/thomas/projets/buildroot/output/build/lttng-tools-2.8.2 -xf -
>>> lttng-tools 2.8.2 Patching
Applying 0001-Fix-snapshot-del-output-with-name-on-musl.patch using patch:
patching file src/bin/lttng/commands/snapshot.c
Hunk #1 FAILED at 350.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/lttng/commands/snapshot.c.rej
package/pkg-generic.mk:180: recipe for target '/home/thomas/projets/buildroot/output/build/lttng-tools-2.8.2/.stamp_patched' failed
And indeed the code and your patch clearly don't match. Your patch does:
errno = 0;
id = strtol(argv[1], &name, 10);
- if (id == 0 && errno == 0) {
+ if (id == 0 && (errno == 0 || errno == EINVAL)) {
ret = del_output(UINT32_MAX, name);
} else if (errno == 0 && *name == '\0') {
ret = del_output(id, NULL);
And the code looks like this:
errno = 0;
id = strtol(argv[1], &name, 10);
if (id == 0 && errno == 0) {
if (lttng_opt_mi) {
ret = mi_del_output(UINT32_MAX, name);
} else {
ret = del_output(UINT32_MAX, name);
}
} else if (errno == 0 && *name == '\0') {
if (lttng_opt_mi) {
ret = mi_del_output(id, NULL);
} else {
ret = del_output(id, NULL);
}
See the if (lttng_opt_mi), which is not in the context of your patch?
So either I'm missing something, or you have not even build-tested the
patches you are sending.
Could you rework this and send an updated version?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
@ 2016-11-01 14:25 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-01 14:25 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 03:46:16 -0400, Philippe Proulx wrote:
> 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 <eeppeliteloop@gmail.com>
> ---
> Changes v2 -> v3:
> - Add link to original patch in patch file.
> - Move Python agent stuff to another patch.
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
@ 2016-11-01 14:25 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-01 14:25 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 03:46:17 -0400, Philippe Proulx wrote:
> 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 <eeppeliteloop@gmail.com>
> ---
> This is a new patch in v3.
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
@ 2016-11-01 14:26 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-01 14:26 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 03:46:19 -0400, Philippe Proulx wrote:
> 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 <eeppeliteloop@gmail.com>
> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> Changes v2 -> v3:
> - Nothing changed.
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
2016-10-31 10:12 ` Yann E. MORIN
@ 2016-11-01 14:30 ` Thomas Petazzoni
1 sibling, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-01 14:30 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 03:46:21 -0400, Philippe Proulx wrote:
> 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 <eeppeliteloop@gmail.com>
This commit doesn't apply:
thomas at skate:~/projets/buildroot (master)$ git pwam 689227
Applying patch #689227 using 'git am -s -3'
Description: [v3,6/9] lttng-babeltrace: bump to version 1.4.0
Applying: lttng-babeltrace: bump to version 1.4.0
Using index info to reconstruct a base tree...
.git/rebase-apply/patch:55: space before tab in indent.
# Check if libelf and libdw are present
.git/rebase-apply/patch:56: space before tab in indent.
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.)])
.git/rebase-apply/patch:57: space before tab in indent.
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.)])
.git/rebase-apply/patch:203: space before tab in indent.
test_ctf_writer_complete
.git/rebase-apply/patch:208: space before tab in indent.
$(top_builddir)/lib/libbabeltrace.la \
error: patch failed: package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch:1
error: package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 lttng-babeltrace: bump to version 1.4.0
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".
It seems that again, your patches are not correct.
> +@@ -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.)])
Rather than removing a check, please add an autoconf cache variable, so
that we can override the result of the test using a cache variable, and
your patch can be submitted (and hopefully) accepted upstream.
I'm going to skip patches 7 to 9, since they also apply to
lttng-babeltrace.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
2016-10-31 16:36 ` Philippe Proulx
@ 2016-11-02 22:29 ` Thomas Petazzoni
2016-11-02 23:07 ` Philippe Proulx
2016-12-13 23:03 ` Thomas Petazzoni
2 siblings, 1 reply; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-02 22:29 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 13:48:57 +0100, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Philippe Proulx <eeppeliteloop@gmail.com>
> ---
> package/babeltrace/babeltrace.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/babeltrace/babeltrace.mk b/package/babeltrace/babeltrace.mk
> index d178a6c..17eaaaa 100644
> --- a/package/babeltrace/babeltrace.mk
> +++ b/package/babeltrace/babeltrace.mk
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-11-02 22:29 ` Thomas Petazzoni
@ 2016-11-02 23:07 ` Philippe Proulx
2016-11-03 8:25 ` Thomas Petazzoni
0 siblings, 1 reply; 36+ messages in thread
From: Philippe Proulx @ 2016-11-02 23:07 UTC (permalink / raw)
To: buildroot
On Wed, Nov 2, 2016 at 6:29 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Mon, 31 Oct 2016 13:48:57 +0100, Yann E. MORIN wrote:
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> Cc: Philippe Proulx <eeppeliteloop@gmail.com>
>> ---
>> package/babeltrace/babeltrace.mk | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/babeltrace/babeltrace.mk b/package/babeltrace/babeltrace.mk
>> index d178a6c..17eaaaa 100644
>> --- a/package/babeltrace/babeltrace.mk
>> +++ b/package/babeltrace/babeltrace.mk
>> @@ -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?
Ideally, no. I guess we should use the same strategy as for the target package.
Phil
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-11-02 23:07 ` Philippe Proulx
@ 2016-11-03 8:25 ` Thomas Petazzoni
2016-11-03 17:41 ` Philippe Proulx
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Petazzoni @ 2016-11-03 8:25 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 2 Nov 2016 19:07:11 -0400, Philippe Proulx wrote:
> > 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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-11-03 8:25 ` Thomas Petazzoni
@ 2016-11-03 17:41 ` Philippe Proulx
0 siblings, 0 replies; 36+ messages in thread
From: Philippe Proulx @ 2016-11-03 17:41 UTC (permalink / raw)
To: buildroot
On Thu, Nov 3, 2016 at 4:25 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Wed, 2 Nov 2016 19:07:11 -0400, Philippe Proulx wrote:
>
>> > 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.
Debug info suppot is a nice-to-have when you trace instrumented user
applications. It's not the end of the world, IMO, to build host-elfutils
when you need host-lttng-babeltrace anyway... one of the reasons of
having lttng-babeltrace as a host package in the first place is that
some distributions provide an outdated Babeltrace package, and the
recent Babeltrace 1.4 offers this debug info feature.
Phil
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 1/2] package/elfutils: add host variant
2016-10-31 12:48 ` [Buildroot] [PATCH 1/2] package/elfutils: add host variant Yann E. MORIN
@ 2016-12-13 23:02 ` Thomas Petazzoni
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-12-13 23:02 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 13:48:56 +0100, Yann E. MORIN wrote:
> 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" <yann.morin.1998@free.fr>
> Cc: Philippe Proulx <eeppeliteloop@gmail.com>
> ---
> package/elfutils/elfutils.mk | 9 +++++++++
> 1 file changed, 9 insertions(+)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the host variant
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
2016-10-31 16:36 ` Philippe Proulx
2016-11-02 22:29 ` Thomas Petazzoni
@ 2016-12-13 23:03 ` Thomas Petazzoni
2 siblings, 0 replies; 36+ messages in thread
From: Thomas Petazzoni @ 2016-12-13 23:03 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 31 Oct 2016 13:48:57 +0100, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Philippe Proulx <eeppeliteloop@gmail.com>
> ---
> package/babeltrace/babeltrace.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to master after rebasing on top of master, and fixing the typo.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2016-12-13 23:03 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:16 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:26 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3 Philippe Proulx
2016-10-31 9:57 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
2016-10-31 10:12 ` Yann E. MORIN
2016-11-01 14:30 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility Philippe Proulx
2016-10-31 10:14 ` Yann E. MORIN
2016-10-31 16:39 ` Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support Philippe Proulx
2016-10-31 11:24 ` Yann E. MORIN
2016-10-31 12:43 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
2016-10-31 12:48 ` [Buildroot] [PATCH 1/2] package/elfutils: add host variant Yann E. MORIN
2016-12-13 23:02 ` Thomas Petazzoni
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
2016-10-31 16:36 ` Philippe Proulx
2016-11-02 22:29 ` Thomas Petazzoni
2016-11-02 23:07 ` Philippe Proulx
2016-11-03 8:25 ` Thomas Petazzoni
2016-11-03 17:41 ` Philippe Proulx
2016-12-13 23:03 ` Thomas Petazzoni
2016-10-31 10:39 ` [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Yann E. MORIN
2016-10-31 16:42 ` Philippe Proulx
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.