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>
This commit is contained in:
Alexander Kanavin 2016-06-28 11:06:14 +03:00 committed by Richard Purdie
parent c04d4a0697
commit f31597a8b9
3 changed files with 6 additions and 77 deletions

View File

@ -1,44 +0,0 @@
From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001
From: Francis Giraldeau <francis.giraldeau@gmail.com>
Date: Mon, 15 Jun 2015 11:43:02 -0400
Subject: [PATCH] Fix invalid pointer free with trace collection
Upstream-Status: Submitted
Patch proposed by Li RongQing related to bug# 790
Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com>
---
lib/context.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/context.c b/lib/context.c
index 45aab34..8d3770f 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -79,7 +79,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
struct bt_trace_descriptor *td;
struct bt_format *fmt;
struct bt_trace_handle *handle;
- int ret, closeret;
+ int ret;
if (!ctx || !format_name || (!path && !stream_list))
return -EINVAL;
@@ -159,10 +159,8 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
return handle->id;
error:
- closeret = fmt->close_trace(td);
- if (closeret) {
- fprintf(stderr, "Error in close_trace callback\n");
- }
+ if (handle)
+ bt_context_remove_trace(ctx, handle->id);
end:
return ret;
}
--
1.9.1

View File

@ -1,29 +0,0 @@
From 8331b87845cafdda40e59a682f2ca8120ed0c472 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 31 Dec 2015 08:17:40 +0000
Subject: [PATCH] lttng-live: Include sys/param.h for MAXNAMLEN defintion
exposed on musl based systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: pending
formats/lttng-live/lttng-live.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h
index 4ab641d..808ed2b 100644
--- a/formats/lttng-live/lttng-live.h
+++ b/formats/lttng-live/lttng-live.h
@@ -25,6 +25,7 @@
*/
#include <stdint.h>
+#include <sys/param.h>
#include "lttng-viewer-abi.h"
#define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344
--
2.6.4

View File

@ -12,9 +12,11 @@ inherit autotools pkgconfig
SRCREV = "c551f7a1ed635138b083b4e9e0c445ef63d0a562"
SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.3 \
file://0001-Fix-invalid-pointer-free-with-trace-collection.patch \
file://0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch \
SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--disable-debug-info"
SRC_URI[md5sum] = "fa99064048af5c9c6ff00e489ac809c2"
SRC_URI[sha256sum] = "9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4"