diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-12-22 09:28:26 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-24 08:21:23 +0000 |
commit | 7c4802d3a88aa0782f773af3270141f3e5ba72d1 (patch) | |
tree | 5ef1d0b8477b34c9a895f6e08b5ca0260b7f867b /meta/recipes-kernel/systemtap/systemtap_git.inc | |
parent | 7af854bc9d49e65acc61c863ce729fb31e08201c (diff) | |
download | poky-7c4802d3a88aa0782f773af3270141f3e5ba72d1.tar.gz |
systemtap: fix on target build for 4.4 and 5.10+
The following systemtap commit:
commit 7615cae790c899bc8a82841c75c8ea9c6fa54df3
Author: Frank Ch. Eigler <fche@redhat.com>
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 <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap_git.inc')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
1 files changed, 1 insertions, 0 deletions
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 \ | |||
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 \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' | 13 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' |