diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-06-28 11:06:14 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-10 14:12:16 +0100 |
commit | f31597a8b91bdd1619521cbce30405cb01182dce (patch) | |
tree | 61b3b0b61f038bfe0850a798e1860dc1e73955b7 /meta/recipes-kernel/lttng/babeltrace | |
parent | c04d4a0697e4703339a79ef3d18700f2e5520d3d (diff) | |
download | poky-f31597a8b91bdd1619521cbce30405cb01182dce.tar.gz |
babeltrace: update to 1.4.0
Switch to using tarballs for upstream releases.
Drop merged patches.
Add a --disable-debug-info parameter to ./configure, as it otherwise
attempts to execute a small test binary. If this (new) feature is truly needed,
we can set up a qemu wrapper later, or patch autoconf macros.
(From OE-Core rev: 3c53af483d46d6fbc8ad5bd764c01897f2ed5c1b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/babeltrace')
2 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch deleted file mode 100644 index 3e2c4e1e68..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001 | ||
2 | From: Francis Giraldeau <francis.giraldeau@gmail.com> | ||
3 | Date: Mon, 15 Jun 2015 11:43:02 -0400 | ||
4 | Subject: [PATCH] Fix invalid pointer free with trace collection | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Patch proposed by Li RongQing related to bug# 790 | ||
9 | |||
10 | Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> | ||
11 | Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com> | ||
12 | --- | ||
13 | lib/context.c | 8 +++----- | ||
14 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/lib/context.c b/lib/context.c | ||
17 | index 45aab34..8d3770f 100644 | ||
18 | --- a/lib/context.c | ||
19 | +++ b/lib/context.c | ||
20 | @@ -79,7 +79,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, | ||
21 | struct bt_trace_descriptor *td; | ||
22 | struct bt_format *fmt; | ||
23 | struct bt_trace_handle *handle; | ||
24 | - int ret, closeret; | ||
25 | + int ret; | ||
26 | |||
27 | if (!ctx || !format_name || (!path && !stream_list)) | ||
28 | return -EINVAL; | ||
29 | @@ -159,10 +159,8 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, | ||
30 | return handle->id; | ||
31 | |||
32 | error: | ||
33 | - closeret = fmt->close_trace(td); | ||
34 | - if (closeret) { | ||
35 | - fprintf(stderr, "Error in close_trace callback\n"); | ||
36 | - } | ||
37 | + if (handle) | ||
38 | + bt_context_remove_trace(ctx, handle->id); | ||
39 | end: | ||
40 | return ret; | ||
41 | } | ||
42 | -- | ||
43 | 1.9.1 | ||
44 | |||
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch b/meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch deleted file mode 100644 index eb16cd1d2e..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 8331b87845cafdda40e59a682f2ca8120ed0c472 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 31 Dec 2015 08:17:40 +0000 | ||
4 | Subject: [PATCH] lttng-live: Include sys/param.h for MAXNAMLEN defintion | ||
5 | |||
6 | exposed on musl based systems | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: pending | ||
11 | |||
12 | formats/lttng-live/lttng-live.h | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h | ||
16 | index 4ab641d..808ed2b 100644 | ||
17 | --- a/formats/lttng-live/lttng-live.h | ||
18 | +++ b/formats/lttng-live/lttng-live.h | ||
19 | @@ -25,6 +25,7 @@ | ||
20 | */ | ||
21 | |||
22 | #include <stdint.h> | ||
23 | +#include <sys/param.h> | ||
24 | #include "lttng-viewer-abi.h" | ||
25 | |||
26 | #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344 | ||
27 | -- | ||
28 | 2.6.4 | ||
29 | |||