diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 00:26:03 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-17 21:31:37 +0100 |
| commit | 0cc1b4141dc840f36530f71b8b1d2a39e9f227ea (patch) | |
| tree | 9b85a53108ba3bdb4a6f971ea724940dd5e0b410 | |
| parent | f393b5d4ce6710bbfedc1832b78c5900f9af9695 (diff) | |
| download | poky-0cc1b4141dc840f36530f71b8b1d2a39e9f227ea.tar.gz | |
systemtap: Fix headers issue with x86 and 5.13 headers
On some x86 platforms there were header issues causing pt_regs compile
failures for our stap tests, e.g. on genericx86-64 but not qemux86-64.
Backport a patch from upstream which fixes the issue.
[YOCTO #14491]
(From OE-Core rev: 3934d33861ebf18e3208b09b892b39b16e350157)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a4ad6c88b683b7310ef46d89b1add80b0f41bf2d)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch b/meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch new file mode 100644 index 0000000000..4d044de7ee --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Du Zhe <duzhe0211+sourceware@gmail.com> | ||
| 3 | Date: Tue, 13 Jul 2021 19:11:55 -0400 | ||
| 4 | Subject: [PATCH] runtime: fix unintended compile error with | ||
| 5 | autoconf-x86-uniregs.c | ||
| 6 | |||
| 7 | Adding a #include <linux/sched.h> restores this test on the gentoo | ||
| 8 | linux-5.10.47-gentoo kernel. | ||
| 9 | |||
| 10 | Upstream-Status: Backport | ||
| 11 | --- | ||
| 12 | runtime/linux/autoconf-x86-uniregs.c | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/runtime/linux/autoconf-x86-uniregs.c b/runtime/linux/autoconf-x86-uniregs.c | ||
| 16 | index 25729c220..232c18670 100644 | ||
| 17 | --- a/runtime/linux/autoconf-x86-uniregs.c | ||
| 18 | +++ b/runtime/linux/autoconf-x86-uniregs.c | ||
| 19 | @@ -1,3 +1,4 @@ | ||
| 20 | +#include <linux/sched.h> | ||
| 21 | #include <asm/ptrace.h> | ||
| 22 | |||
| 23 | #if defined (__i386__) || defined (__x86_64__) | ||
| 24 | -- | ||
| 25 | 2.27.0 | ||
| 26 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 016b423847..73fba981b7 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
| @@ -8,6 +8,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ | |||
| 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 | file://0001-transport-protect-include-and-callsite-with-same-con.patch \ |
| 11 | file://ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch \ | ||
| 11 | " | 12 | " |
| 12 | 13 | ||
| 13 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' | 14 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' |
