From 3c53af483d46d6fbc8ad5bd764c01897f2ed5c1b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 28 Jun 2016 11:06:14 +0300 Subject: 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. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...nvalid-pointer-free-with-trace-collection.patch | 44 ---------------------- ...Include-sys-param.h-for-MAXNAMLEN-definti.patch | 29 -------------- meta/recipes-kernel/lttng/babeltrace_1.3.2.bb | 20 ---------- meta/recipes-kernel/lttng/babeltrace_1.4.0.bb | 22 +++++++++++ 4 files changed, 22 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch delete mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch delete mode 100644 meta/recipes-kernel/lttng/babeltrace_1.3.2.bb create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.4.0.bb 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 @@ -From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001 -From: Francis Giraldeau -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 -Signed-off-by: Francis Giraldeau ---- - 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 - 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 @@ -From 8331b87845cafdda40e59a682f2ca8120ed0c472 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- -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 -+#include - #include "lttng-viewer-abi.h" - - #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344 --- -2.6.4 - diff --git a/meta/recipes-kernel/lttng/babeltrace_1.3.2.bb b/meta/recipes-kernel/lttng/babeltrace_1.3.2.bb deleted file mode 100644 index a7df6300cc..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace_1.3.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Babeltrace - Trace Format Babel Tower" -DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." -HOMEPAGE = "http://www.efficios.com/babeltrace/" -BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" - -LICENSE = "MIT & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" - -DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" - -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 \ -" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/lttng/babeltrace_1.4.0.bb b/meta/recipes-kernel/lttng/babeltrace_1.4.0.bb new file mode 100644 index 0000000000..854e278def --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace_1.4.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Babeltrace - Trace Format Babel Tower" +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." +HOMEPAGE = "http://www.efficios.com/babeltrace/" +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" + +LICENSE = "MIT & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +inherit autotools pkgconfig + +SRCREV = "c551f7a1ed635138b083b4e9e0c445ef63d0a562" + +SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \ +" + +EXTRA_OECONF = "--disable-debug-info" + +SRC_URI[md5sum] = "fa99064048af5c9c6ff00e489ac809c2" +SRC_URI[sha256sum] = "9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4" + -- cgit 1.2.3-korg