summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel')
-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/x32.patch36
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.0.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb)14
3 files changed, 50 insertions, 43 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
new file mode 100644
index 0000000000..a150d648ab
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-lib.patch
@@ -0,0 +1,43 @@
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/x32.patch b/meta/recipes-kernel/lttng/lttng-tools/x32.patch
deleted file mode 100644
index 42cebf94ac..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/x32.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Fix build for x32
2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4
5Fix build error of src/common/utils.c for x32.
6
7Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/150]
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
10
11diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
12index 0e96ef0c..5c79c8c7 100644
13--- a/src/bin/lttng/utils.c
14+++ b/src/bin/lttng/utils.c
15@@ -158,7 +158,7 @@ unsigned int fls_u32(uint32_t x)
16 #define HAS_FLS_U32
17 #endif
18
19-#if defined(__x86_64)
20+#if defined(__x86_64) && !defined(__ILP32__)
21 static inline
22 unsigned int fls_u64(uint64_t x)
23 {
24diff --git a/src/common/utils.c b/src/common/utils.c
25index 08139e5e..3c389981 100644
26--- a/src/common/utils.c
27+++ b/src/common/utils.c
28@@ -1223,7 +1223,7 @@ static inline unsigned int fls_u32(uint32_t x)
29 #define HAS_FLS_U32
30 #endif
31
32-#if defined(__x86_64)
33+#if defined(__x86_64) && !defined(__ILP32__)
34 static inline
35 unsigned int fls_u64(uint64_t x)
36 {
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.0.bb
index 36a19ec18d..148a7928d2 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.0.bb
@@ -5,9 +5,9 @@ to extract program execution details from the Linux operating system \
5and interpret them." 5and interpret them."
6 6
7LICENSE = "GPLv2 & LGPLv2.1" 7LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ 8LIC_FILES_CHKSUM = "file://LICENSE;md5=40ef17463fbd6f377db3c47b1cbaded8 \
9 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://LICENSES/GPL-2.0;md5=e68f69a54b44ba526ad7cb963e18fbce \
10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" 10 file://LICENSES/LGPL-2.1;md5=9920968d0f2ff585ce61fae30344dd95"
11 11
12DEPENDS = "liburcu popt libxml2 util-linux" 12DEPENDS = "liburcu popt libxml2 util-linux"
13RDEPENDS_${PN} = "libgcc" 13RDEPENDS_${PN} = "libgcc"
@@ -29,15 +29,15 @@ PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-nat
29PACKAGECONFIG_remove_arc = "lttng-ust" 29PACKAGECONFIG_remove_arc = "lttng-ust"
30 30
31SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ 31SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
32 file://x32.patch \
33 file://0001-tests-do-not-strip-a-helper-library.patch \ 32 file://0001-tests-do-not-strip-a-helper-library.patch \
34 file://run-ptest \ 33 file://run-ptest \
35 file://lttng-sessiond.service \ 34 file://lttng-sessiond.service \
36 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 " 37 "
38 38
39SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" 39SRC_URI[md5sum] = "4592201ea981f0722438345fb1f009d2"
40SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" 40SRC_URI[sha256sum] = "405661d27617dc79a42712174a051a45c7ca12d167576c0d93f2de708ed29445"
41 41
42inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 42inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
43 43
@@ -71,7 +71,7 @@ do_install_ptest () {
71 install -D "${B}/$f" "${D}${PTEST_PATH}/$f" 71 install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
72 done 72 done
73 73
74 for f in config/tap-driver.sh config/test-driver src/common/config/session.xsd src/common/mi-lttng-3.0.xsd; do 74 for f in config/tap-driver.sh config/test-driver src/common/config/session.xsd src/common/mi-lttng-4.0.xsd; do
75 install -D "${S}/$f" "${D}${PTEST_PATH}/$f" 75 install -D "${S}/$f" "${D}${PTEST_PATH}/$f"
76 done 76 done
77 77