summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2022-06-02 15:39:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-04 11:28:23 +0100
commit27e4b90518be7849fc7dbedcc70763d6c3bc73d5 (patch)
tree957a43afdd47e8860dde8832c21be6ba49ac9e4b
parentb4a12cfb9ce3e71b92dd82f50bb39fdc45560586 (diff)
downloadpoky-27e4b90518be7849fc7dbedcc70763d6c3bc73d5.tar.gz
lttng-modules: Fix build failure for 5.10.119+ and 5.15.44+ kernel
The following kernel commit has been back ported to v5.10.119 and v5.15.44. commit 14c174633f349cb41ea90c2c0aaddac157012f74 Author: Jason A. Donenfeld <Jason@zx2c4.com> Date: Thu Feb 10 16:40:44 2022 +0100 random: remove unused tracepoints These explicit tracepoints aren't really used and show sign of aging. It's work to keep these up to date, and before I attempted to keep them up to date, they weren't up to date, which indicates that they're not really used. These days there are better ways of introspecting anyway. Which causes the following build failure lttng-modules-2.13.3/src/probes/lttng-probe-random.c:18:10: fatal error: trace/events/random.h: No such file or directory | 18 | #include <trace/events/random.h> | | ^~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated. (From OE-Core rev: c8effd12cae7c7024f8e6c8f6ef70ed602d380ed) Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch44
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch
new file mode 100644
index 0000000000..361a59c2e5
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch
@@ -0,0 +1,44 @@
1From 13e4c978d45237b8780f1de6d404812b3af26a49 Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com>
3Date: Thu, 2 Jun 2022 06:36:08 +0000
4Subject: [PATCH] fix: random: remove unused tracepoints (v5.10, v5.15)
5
6The following kernel commit has been back ported to v5.10.119 and v5.15.44.
7
8commit 14c174633f349cb41ea90c2c0aaddac157012f74
9Author: Jason A. Donenfeld <Jason@zx2c4.com>
10Date: Thu Feb 10 16:40:44 2022 +0100
11
12 random: remove unused tracepoints
13
14 These explicit tracepoints aren't really used and show sign of aging.
15 It's work to keep these up to date, and before I attempted to keep them
16 up to date, they weren't up to date, which indicates that they're not
17 really used. These days there are better ways of introspecting anyway.
18
19Upstream-Status: Pending
20
21Signed-off-by: He Zhe <zhe.he@windriver.com>
22---
23 src/probes/Kbuild | 5 ++++-
24 1 file changed, 4 insertions(+), 1 deletion(-)
25
26diff --git a/src/probes/Kbuild b/src/probes/Kbuild
27index 5478447..31e0ee8 100644
28--- a/src/probes/Kbuild
29+++ b/src/probes/Kbuild
30@@ -204,7 +204,10 @@ endif
31
32 # Introduced in v3.6, remove in v5.18
33 obj-$(CONFIG_LTTNG) += $(shell \
34- if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \
35+ if [ \( ! \( $(VERSION) -ge 6 \
36+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \
37+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 15 -a $(SUBLEVEL) -ge 44 \) \
38+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 10 -a $(SUBLEVEL) -ge 119\) \) \) \
39 -a \
40 $(VERSION) -ge 4 \
41 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \
42--
432.32.0
44
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb
index a5e6b906d2..e049bdc6d2 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb
@@ -21,6 +21,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
21 file://0009-Rename-genhd-wrapper-to-blkdev.patch \ 21 file://0009-Rename-genhd-wrapper-to-blkdev.patch \
22 file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \ 22 file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \
23 file://0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch \ 23 file://0001-fix-sched-tracing-Append-prev_state-to-tp-args-inste.patch \
24 file://0001-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch \
24 " 25 "
25 26
26# Use :append here so that the patch is applied also when using devupstream 27# Use :append here so that the patch is applied also when using devupstream