diff options
author | Alexander Kanavin <alex@linutronix.de> | 2025-06-06 22:58:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-12 11:03:43 +0100 |
commit | 2db3a58bc739ca1f84a8553a327cd397ebe7af66 (patch) | |
tree | 0e7d741ddf9b270fbccdbc17a93ec926995b797a /meta/recipes-kernel/systemtap | |
parent | cab55df1ceab6b948a76cc073c44ebf5fc80191f (diff) | |
download | poky-2db3a58bc739ca1f84a8553a327cd397ebe7af66.tar.gz |
systemtap: correctly set include location for the python module
This issue was as well exposed by setting S to be in UNPACKDIR.
(From OE-Core rev: a9b8cd548bc4f12b7aa28209d7c04181c95b7e7a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.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-python-Makefile.am-use-absolute-path-for-source-dire.patch | 36 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_5.2.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch b/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch new file mode 100644 index 0000000000..dacd19edd1 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 71e4ffd46dbbb7de1d06edb66f3e1fe0de423586 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 21 May 2025 13:25:46 +0200 | ||
4 | Subject: [PATCH] python/Makefile.am: use absolute path for source directory | ||
5 | includes as well | ||
6 | |||
7 | Otherwise it would be relative to the build directory, | ||
8 | which works only if the build and source directory are in the | ||
9 | same parent directory, and breaks if they're on different levels. | ||
10 | |||
11 | Upstream-Status: Submitted [by email to fche@redhat.com,wcohen@redhat.com,systemtap@sourceware.org] | ||
12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
13 | --- | ||
14 | python/Makefile.am | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/python/Makefile.am b/python/Makefile.am | ||
18 | index 9d5cb7bcb..130e90b24 100644 | ||
19 | --- a/python/Makefile.am | ||
20 | +++ b/python/Makefile.am | ||
21 | @@ -2,10 +2,10 @@ | ||
22 | |||
23 | AUTOMAKE_OPTIONS = subdir-objects | ||
24 | |||
25 | -# Note that we have to use 'abs_builddir' here since we change | ||
26 | +# Note that we have to use absolute directores here since we change | ||
27 | # directories back to the source directory when building the python | ||
28 | # extension. | ||
29 | -AM_CPPFLAGS = -I$(srcdir)/../includes | ||
30 | +AM_CPPFLAGS = -I$(abs_srcdir)/../includes | ||
31 | AM_CPPFLAGS += -I$(abs_builddir)/../includes/sys | ||
32 | |||
33 | # Add OE's CFLAGS which contains `-fdebug-prefix-map' options to | ||
34 | -- | ||
35 | 2.39.5 | ||
36 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap_5.2.bb b/meta/recipes-kernel/systemtap/systemtap_5.2.bb index 254bac4d6f..588b3b8d36 100644 --- a/meta/recipes-kernel/systemtap/systemtap_5.2.bb +++ b/meta/recipes-kernel/systemtap/systemtap_5.2.bb | |||
@@ -9,6 +9,7 @@ require systemtap_git.inc | |||
9 | SRC_URI += " \ | 9 | SRC_URI += " \ |
10 | file://0001-improve-reproducibility-for-c-compiling.patch \ | 10 | file://0001-improve-reproducibility-for-c-compiling.patch \ |
11 | file://0001-staprun-address-ncurses-6.3-failures.patch \ | 11 | file://0001-staprun-address-ncurses-6.3-failures.patch \ |
12 | file://0001-python-Makefile.am-use-absolute-path-for-source-dire.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | DEPENDS = "elfutils" | 15 | DEPENDS = "elfutils" |