diff options
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap')
2 files changed, 61 insertions, 44 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch new file mode 100644 index 0000000000..1decf21593 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From 191f528da19193d713d94ee252e2485efd9af4d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 25 Oct 2021 17:59:24 +0200 | ||
4 | Subject: [PATCH] staprun: address ncurses 6.3 failures | ||
5 | |||
6 | Upstream-Status: Submitted [by email to smakarov@redhat.com,systemtap@sourceware.org] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | staprun/monitor.c | 24 ++++++++++++------------ | ||
10 | 1 file changed, 12 insertions(+), 12 deletions(-) | ||
11 | |||
12 | diff --git a/staprun/monitor.c b/staprun/monitor.c | ||
13 | index 478634c09..f4fbfd686 100644 | ||
14 | --- a/staprun/monitor.c | ||
15 | +++ b/staprun/monitor.c | ||
16 | @@ -448,12 +448,12 @@ void monitor_render(void) | ||
17 | if (active_window == 0) | ||
18 | wattron(status, A_BOLD); | ||
19 | wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", | ||
20 | - width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), | ||
21 | - width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), | ||
22 | - width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), | ||
23 | - width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), | ||
24 | - width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), | ||
25 | - width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), | ||
26 | + (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), | ||
27 | + (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), | ||
28 | + (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), | ||
29 | + (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), | ||
30 | + (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), | ||
31 | + (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), | ||
32 | HIGHLIGHT("name", p_name, comp_fn_index)); | ||
33 | if (active_window == 0) | ||
34 | wattroff(status, A_BOLD); | ||
35 | @@ -466,17 +466,17 @@ void monitor_render(void) | ||
36 | json_object *probe, *field; | ||
37 | probe = json_object_array_get_idx(jso_probe_list, i); | ||
38 | json_object_object_get_ex(probe, "index", &field); | ||
39 | - wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); | ||
40 | + wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field)); | ||
41 | json_object_object_get_ex(probe, "state", &field); | ||
42 | - wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); | ||
43 | + wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field)); | ||
44 | json_object_object_get_ex(probe, "hits", &field); | ||
45 | - wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); | ||
46 | + wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field)); | ||
47 | json_object_object_get_ex(probe, "min", &field); | ||
48 | - wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); | ||
49 | + wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field)); | ||
50 | json_object_object_get_ex(probe, "avg", &field); | ||
51 | - wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); | ||
52 | + wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field)); | ||
53 | json_object_object_get_ex(probe, "max", &field); | ||
54 | - wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); | ||
55 | + wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field)); | ||
56 | getyx(status, discard, cur_x); | ||
57 | json_object_object_get_ex(probe, "name", &field); | ||
58 | wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); | ||
59 | -- | ||
60 | 2.20.1 | ||
61 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch b/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch deleted file mode 100644 index efc79f6c0f..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Fri, 18 Dec 2020 13:15:08 -0500 | ||
4 | Subject: [PATCH] transport: protect include and callsite with same conditional | ||
5 | |||
6 | transport.c has the following code block: | ||
7 | |||
8 | if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS)) | ||
9 | |||
10 | Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS. | ||
11 | |||
12 | linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and | ||
13 | must be included or we have a compilation issue. | ||
14 | |||
15 | The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM, | ||
16 | which means that in some configurations we can get out of sync with | ||
17 | the include and the callsite. | ||
18 | |||
19 | If we protect the include and the callsite with the same #ifdef, we can | ||
20 | be sure that they will be consistent. | ||
21 | |||
22 | Upstream-status: Inappropriate (kernel-devsrc specific) | ||
23 | |||
24 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
25 | --- | ||
26 | runtime/transport/transport.c | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c | ||
30 | index bb4a98bd3..88e20ea28 100644 | ||
31 | --- a/runtime/transport/transport.c | ||
32 | +++ b/runtime/transport/transport.c | ||
33 | @@ -21,7 +21,7 @@ | ||
34 | #include <linux/namei.h> | ||
35 | #include <linux/delay.h> | ||
36 | #include <linux/mutex.h> | ||
37 | -#ifdef CONFIG_SECURITY_LOCKDOWN_LSM | ||
38 | +#ifdef STAPCONF_LOCKDOWN_DEBUGFS | ||
39 | #include <linux/security.h> | ||
40 | #endif | ||
41 | #include "../uidgid_compatibility.h" | ||
42 | -- | ||
43 | 2.19.1 | ||
44 | |||