summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/systemtap
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-05-24 11:13:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-25 22:36:09 +0100
commit33d1dbeebadc4b3ec69b81d0fd1d23aabfc26c49 (patch)
tree0c5f04fc3f01f905b532cec1f2a3450e4adb058c /meta/recipes-kernel/systemtap
parent58515daf6b59884550268d9514146604651e8d80 (diff)
downloadpoky-33d1dbeebadc4b3ec69b81d0fd1d23aabfc26c49.tar.gz
systemtap: update 4.4 -> 4.5
Drop 0001-transport-protect-include-and-callsite-with-same-con.patch as upstream made the same change: https://sourceware.org/git/?p=systemtap.git;a=commitdiff;h=0d80048e02ecf6876c9f9ebeea387af9fb2a8051 (From OE-Core rev: 1d207eac08d9392b0ae53a2e740aabad72e57750) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch44
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc5
2 files changed, 2 insertions, 47 deletions
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 @@
1From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Fri, 18 Dec 2020 13:15:08 -0500
4Subject: [PATCH] transport: protect include and callsite with same conditional
5
6transport.c has the following code block:
7
8 if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS))
9
10Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS.
11
12linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and
13must be included or we have a compilation issue.
14
15The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM,
16which means that in some configurations we can get out of sync with
17the include and the callsite.
18
19If we protect the include and the callsite with the same #ifdef, we can
20be sure that they will be consistent.
21
22Upstream-status: Inappropriate (kernel-devsrc specific)
23
24Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
25---
26 runtime/transport/transport.c | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
30index 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--
432.19.1
44
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 016b423847..23ecc61987 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,12 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "988f439af39a359b4387963ca4633649866d8275" 3SRCREV = "0eba8a46bc99c66e5dd274a9a4d661fe08ac4b8a"
4PV = "4.4" 4PV = "4.5"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_URI = "git://sourceware.org/git/systemtap.git \
7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ 7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
8 file://0001-Install-python-modules-to-correct-library-dir.patch \ 8 file://0001-Install-python-modules-to-correct-library-dir.patch \
9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ 9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
10 file://0001-transport-protect-include-and-callsite-with-same-con.patch \
11 " 10 "
12 11
13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' 12COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux'