From 733856ee8458b31074e4df379dc8c1b037251c49 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 28 Oct 2014 07:56:18 -0700 Subject: babeltrace: Upgrade to 1.2.3 Remove backported patches Signed-off-by: Saul Wold --- ...-Support-out-of-tree-builds-in-babeltrace.patch | 17 ------- ...uffers-from-objstack_alloc-on-sizeof-void.patch | 54 ---------------------- meta/recipes-kernel/lttng/babeltrace_1.2.1.bb | 25 ---------- meta/recipes-kernel/lttng/babeltrace_1.2.3.bb | 22 +++++++++ 4 files changed, 22 insertions(+), 96 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch delete mode 100644 meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch delete mode 100644 meta/recipes-kernel/lttng/babeltrace_1.2.1.bb create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.2.3.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch deleted file mode 100644 index 258eedd3ba..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: backport - -babeltrace: Fix support out of tree builds in babeltrace - -Signed-off-by: Lars Persson - -diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am -index c834699..2c6b0bd 100644 ---- a/formats/lttng-live/Makefile.am -+++ b/formats/lttng-live/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir) - - lib_LTLIBRARIES = libbabeltrace-lttng-live.la - - diff --git a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch b/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch deleted file mode 100644 index 8e81d2d781..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cae67efbd9ddf2cee6bbefec076dc8933ababc43 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= -Date: Fri, 16 May 2014 10:10:38 +0800 -Subject: [PATCH] Fix: Align buffers from objstack_alloc on sizeof(void *) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -The buffers from objstack_alloc will store pointers, so they must -be aligned on a pointer's size, or else it will cause issues on the -CPUs which do not support unaligned addresses access. - -Signed-off-by: Fredrik Markstrom -Signed-off-by: Roy Li -Signed-off-by: Jérémie Galarneau ---- - formats/ctf/metadata/objstack.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/formats/ctf/metadata/objstack.c b/formats/ctf/metadata/objstack.c -index 9e264a4..14d9252 100644 ---- a/formats/ctf/metadata/objstack.c -+++ b/formats/ctf/metadata/objstack.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #define OBJSTACK_INIT_LEN 128 - #define OBJSTACK_POISON 0xcc -@@ -39,7 +40,7 @@ struct objstack_node { - struct bt_list_head node; - size_t len; - size_t used_len; -- char data[]; -+ char __attribute__ ((aligned (sizeof(void *)))) data[]; - }; - - BT_HIDDEN -@@ -118,6 +119,8 @@ void *objstack_alloc(struct objstack *objstack, size_t len) - struct objstack_node *last_node; - void *p; - -+ len = ALIGN(len, sizeof(void *)); -+ - /* Get last node */ - last_node = bt_list_entry(objstack->head.prev, - struct objstack_node, node); --- -1.7.10.4 - diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb deleted file mode 100644 index dd9961cde6..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb +++ /dev/null @@ -1,25 +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" - -inherit autotools pkgconfig - -DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" - -SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79" -PV = "1.2.1+git${SRCPV}" - -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ - file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch \ - file://Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch \ -" - -S = "${WORKDIR}/git" - -do_configure_prepend () { - ( cd ${S}; ${S}/bootstrap ) -} diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.3.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.3.bb new file mode 100644 index 0000000000..c62589cc9e --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.3.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" + +inherit autotools pkgconfig + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +SRCREV = "753a40ead9fa4f6bd5e29d5765e2021122df9c1c" +PV = "1.2.3+git${SRCPV}" + +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2" + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ( cd ${S}; ${S}/bootstrap ) +} -- cgit 1.2.3-korg