Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
.../0001-fs.c-initialize-other_entry.patch | 33 -------------------
...eltrace2_2.0.2.bb => babeltrace2_2.0.3.bb} | 9 +++--
2 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch
rename meta/recipes-kernel/lttng/{babeltrace2_2.0.2.bb =>
babeltrace2_2.0.3.bb} (94%)
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 @@
-From 42dae692b9057d03ce9a0651f061472e9dd90130 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli...@windriver.com>
-Date: Wed, 11 Mar 2020 08:44:42 +0000
-Subject: [PATCH] fs.c: initialize the other_entry variable
-
-Initialize the pointer other_entry to fix the below error:
-| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function
'ds_index_insert_ds_index_entry_sorted':
-| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry'
may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| 702 | !ds_index_entries_equal(entry, other_entry)) {
-
-Upstream-Status: Submitted
[https://lists.lttng.org/pipermail/lttng-dev/2020-March/029549.html]
-
-Signed-off-by: Mingli Yu <mingli...@windriver.com>
----
- src/plugins/ctf/fs-src/fs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
-index e87523a3..a6b5315f 100644
---- a/src/plugins/ctf/fs-src/fs.c
-+++ b/src/plugins/ctf/fs-src/fs.c
-@@ -680,7 +680,7 @@ void ds_index_insert_ds_index_entry_sorted(
- struct ctf_fs_ds_index_entry *entry)
- {
- guint i;
-- struct ctf_fs_ds_index_entry *other_entry;
-+ struct ctf_fs_ds_index_entry *other_entry = NULL;
-
- /* Find the spot where to insert this index entry. */
- for (i = 0; i < index->entries->len; i++) {
---
-2.24.1
-
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb
b/meta/recipes-kernel/lttng/babeltrace2_2.0.3.bb
similarity index 94%
rename from meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb
rename to 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"
DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0 \
- file://run-ptest \
- file://0001-tests-do-not-run-test-applications-from-.libs.patch \
+ file://run-ptest \
+ file://0001-tests-do-not-run-test-applications-from-.libs.patch \
file://0001-Make-manpages-multilib-identical.patch \
- file://0001-fs.c-initialize-other_entry.patch \
- "
-SRCREV = "33003c352ed56aa49e0b3df272bbab6fac36cae8"
+ "
+SRCREV = "91d154476e66735d705adda9ca5cbf5b5eea5940"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
S = "${WORKDIR}/git"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139312):
https://lists.openembedded.org/g/openembedded-core/message/139312
Mute This Topic: https://lists.openembedded.org/mt/74747448/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
