summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-16 03:03:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-18 11:44:55 +0100
commit11651de07d1d37bea2a57e667801be0742329d94 (patch)
treee67d1bba06dedd460fc79d78386961949b571823
parent482cee03f275001a66bcbdb86d51e74692ef6056 (diff)
downloadpoky-11651de07d1d37bea2a57e667801be0742329d94.tar.gz
lttng-tools: upgrade 2.12.1 -> 2.12.2
Drop patch merged upstream. (From OE-Core rev: 5df317553cb764ca873bf209bbd2bc8a47296169) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-lib.patch43
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.12.1.bb)3
2 files changed, 1 insertions, 45 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-lib.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-lib.patch
deleted file mode 100644
index a150d648ab..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-lib.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From e5d94cf4882cc6516af52b794c6acb8e4d6469a3 Mon Sep 17 00:00:00 2001
2From: Ovidiu Panait <ovidiu.panait@windriver.com>
3Date: Mon, 18 May 2020 16:39:26 +0300
4Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc
5
6Fix the following build error with musl libc:
7In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14,
8 from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10:
9../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
10 17 | TP_ARGS(ino_t, ns_ino),
11 | ^~~~~
12../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
13 17 | TP_ARGS(ino_t, ns_ino),
14 | ^~~~~
15../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
16 17 | TP_ARGS(ino_t, ns_ino),
17 | ^~~~~~~
18../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
19 17 | TP_ARGS(ino_t, ns_ino),
20 | ^~~~~~~
21
22Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/161]
23
24Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
25---
26 tests/utils/testapp/gen-ust-events-ns/tp.h | 1 +
27 1 file changed, 1 insertion(+)
28
29diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h
30index 4dbfed5..e0ddb29 100644
31--- a/tests/utils/testapp/gen-ust-events-ns/tp.h
32+++ b/tests/utils/testapp/gen-ust-events-ns/tp.h
33@@ -11,6 +11,7 @@
34 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
35 #define _TRACEPOINT_TP_H
36
37+#include <sys/types.h>
38 #include <lttng/tracepoint.h>
39
40 TRACEPOINT_EVENT(tp, tptest,
41--
422.17.1
43
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.1.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb
index 094e33db71..e9c8e18e22 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb
@@ -33,10 +33,9 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
33 file://run-ptest \ 33 file://run-ptest \
34 file://lttng-sessiond.service \ 34 file://lttng-sessiond.service \
35 file://0001-tests-regression-disable-the-tools-live-tests.patch \ 35 file://0001-tests-regression-disable-the-tools-live-tests.patch \
36 file://0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-lib.patch \
37 " 36 "
38 37
39SRC_URI[sha256sum] = "0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8" 38SRC_URI[sha256sum] = "9ed9161795ff023b076f9f95afaa4f1f822ec42495c0fa04c586ab8fa74e84f1"
40 39
41inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 40inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
42 41