summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-10-28 07:56:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-03 12:23:58 +0000
commit2a7b8755c17dc5a9ff6a7218665eaf82b2f315e5 (patch)
treeea6262a1ec1203d49646ae5d5f4da249635d5a29 /meta/recipes-kernel
parentbcff2a7a69f4d9e493e5a2d22ba2b3d5023138cb (diff)
downloadpoky-2a7b8755c17dc5a9ff6a7218665eaf82b2f315e5.tar.gz
babeltrace: Upgrade to 1.2.3
Remove backported patches (From OE-Core rev: 733856ee8458b31074e4df379dc8c1b037251c49) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch17
-rw-r--r--meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch54
-rw-r--r--meta/recipes-kernel/lttng/babeltrace_1.2.3.bb (renamed from meta/recipes-kernel/lttng/babeltrace_1.2.1.bb)9
3 files changed, 3 insertions, 77 deletions
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 @@
1Upstream-Status: backport
2
3babeltrace: Fix support out of tree builds in babeltrace
4
5Signed-off-by: Lars Persson <larper@axis.com>
6
7diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am
8index c834699..2c6b0bd 100644
9--- a/formats/lttng-live/Makefile.am
10+++ b/formats/lttng-live/Makefile.am
11@@ -1,4 +1,4 @@
12-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include
13+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)
14
15 lib_LTLIBRARIES = libbabeltrace-lttng-live.la
16
17
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 @@
1From cae67efbd9ddf2cee6bbefec076dc8933ababc43 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= <fredrik.markstrom@gmail.com>
3Date: Fri, 16 May 2014 10:10:38 +0800
4Subject: [PATCH] Fix: Align buffers from objstack_alloc on sizeof(void *)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Backport
10
11The buffers from objstack_alloc will store pointers, so they must
12be aligned on a pointer's size, or else it will cause issues on the
13CPUs which do not support unaligned addresses access.
14
15Signed-off-by: Fredrik Markstrom <fredrik.markstrom@gmail.com>
16Signed-off-by: Roy Li <rongqing.li@windriver.com>
17Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
18---
19 formats/ctf/metadata/objstack.c | 5 ++++-
20 1 file changed, 4 insertions(+), 1 deletion(-)
21
22diff --git a/formats/ctf/metadata/objstack.c b/formats/ctf/metadata/objstack.c
23index 9e264a4..14d9252 100644
24--- a/formats/ctf/metadata/objstack.c
25+++ b/formats/ctf/metadata/objstack.c
26@@ -27,6 +27,7 @@
27 #include <stdlib.h>
28 #include <babeltrace/list.h>
29 #include <babeltrace/babeltrace-internal.h>
30+#include <babeltrace/align.h>
31
32 #define OBJSTACK_INIT_LEN 128
33 #define OBJSTACK_POISON 0xcc
34@@ -39,7 +40,7 @@ struct objstack_node {
35 struct bt_list_head node;
36 size_t len;
37 size_t used_len;
38- char data[];
39+ char __attribute__ ((aligned (sizeof(void *)))) data[];
40 };
41
42 BT_HIDDEN
43@@ -118,6 +119,8 @@ void *objstack_alloc(struct objstack *objstack, size_t len)
44 struct objstack_node *last_node;
45 void *p;
46
47+ len = ALIGN(len, sizeof(void *));
48+
49 /* Get last node */
50 last_node = bt_list_entry(objstack->head.prev,
51 struct objstack_node, node);
52--
531.7.10.4
54
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.3.bb
index dd9961cde6..c62589cc9e 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.2.3.bb
@@ -10,13 +10,10 @@ inherit autotools pkgconfig
10 10
11DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" 11DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
12 12
13SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79" 13SRCREV = "753a40ead9fa4f6bd5e29d5765e2021122df9c1c"
14PV = "1.2.1+git${SRCPV}" 14PV = "1.2.3+git${SRCPV}"
15 15
16SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ 16SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2"
17 file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch \
18 file://Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch \
19"
20 17
21S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
22 19