summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-06-08 09:46:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-09 13:14:00 +0100
commita1b3536f18fbd3ca8174ade15afb4d93f93775c1 (patch)
treec605ef4b343d55352997fde5a6ddf660f80a9e3a
parentfb2893bf2d5b980ac54fac8ce715eafced6df203 (diff)
downloadpoky-a1b3536f18fbd3ca8174ade15afb4d93f93775c1.tar.gz
babeltrace2: upgrade 2.0.2 -> 2.0.3
(From OE-Core rev: 2827f36db8a0f59555689ebfa5c5848b16ec9c11) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch33
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb (renamed from meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb)9
2 files changed, 4 insertions, 38 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch
deleted file mode 100644
index b56b3bd6e0..0000000000
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 42dae692b9057d03ce9a0651f061472e9dd90130 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 11 Mar 2020 08:44:42 +0000
4Subject: [PATCH] fs.c: initialize the other_entry variable
5
6Initialize the pointer other_entry to fix the below error:
7| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted':
8| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized]
9| 702 | !ds_index_entries_equal(entry, other_entry)) {
10
11Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2020-March/029549.html]
12
13Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14---
15 src/plugins/ctf/fs-src/fs.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
19index e87523a3..a6b5315f 100644
20--- a/src/plugins/ctf/fs-src/fs.c
21+++ b/src/plugins/ctf/fs-src/fs.c
22@@ -680,7 +680,7 @@ void ds_index_insert_ds_index_entry_sorted(
23 struct ctf_fs_ds_index_entry *entry)
24 {
25 guint i;
26- struct ctf_fs_ds_index_entry *other_entry;
27+ struct ctf_fs_ds_index_entry *other_entry = NULL;
28
29 /* Find the spot where to insert this index entry. */
30 for (i = 0; i < index->entries->len; i++) {
31--
322.24.1
33
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb
index 7777f9b39b..c65882581d 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e"
8DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" 8DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
9 9
10SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0 \ 10SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0 \
11 file://run-ptest \ 11 file://run-ptest \
12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \ 12 file://0001-tests-do-not-run-test-applications-from-.libs.patch \
13 file://0001-Make-manpages-multilib-identical.patch \ 13 file://0001-Make-manpages-multilib-identical.patch \
14 file://0001-fs.c-initialize-other_entry.patch \ 14 "
15 " 15SRCREV = "91d154476e66735d705adda9ca5cbf5b5eea5940"
16SRCREV = "33003c352ed56aa49e0b3df272bbab6fac36cae8"
17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"