From 7c4802d3a88aa0782f773af3270141f3e5ba72d1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Dec 2020 09:28:26 -0500 Subject: systemtap: fix on target build for 4.4 and 5.10+ The following systemtap commit: commit 7615cae790c899bc8a82841c75c8ea9c6fa54df3 Author: Frank Ch. Eigler Date: Mon Nov 9 19:18:19 2020 -0500 PR26665: relayfs-on-procfs megapatch Changes the way that capabilities are checked when compiling a systemtap probe. In our cross-build -> on target workflow, this results in a mismatch between the systemtap configuration capabilities and the kernel configuration. The result is a compilation failure since the security components are protected by two different #ifdef's, and they can be out of sync. By protecting the include and callsite with the same #ifdef, we ensure they are in sync and fix our on target problem. While this fix is oe-specific, a variant will be proposed upstream once a deeper analsysis of other options has been completed. (From OE-Core rev: 25fa864270efe3ff5699a1bf9ebdf599e96362a5) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/systemtap/systemtap_git.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-kernel/systemtap/systemtap_git.inc') diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index ae735025b7..016b423847 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -7,6 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ + file://0001-transport-protect-include-and-callsite-with-same-con.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' -- cgit v1.2.3-54-g00ecf