Signed-off-by: Alexander Kanavin <[email protected]> --- .../systemtap/systemtap/python-3.11.patch | 37 ------------------- .../systemtap/systemtap_git.inc | 5 +-- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-kernel/systemtap/systemtap/python-3.11.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/python-3.11.patch b/meta/recipes-kernel/systemtap/systemtap/python-3.11.patch deleted file mode 100644 index 6e0c97b8d6..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/python-3.11.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 069e109c95d1afca17cd3781b39f220cf8b39978 Mon Sep 17 00:00:00 2001 -From: Stan Cox <[email protected]> -Date: Wed, 13 Jul 2022 09:49:51 -0400 -Subject: [PATCH 1/1] python 3.11 removed direct access to PyFrameObject - members - -Take into account the change in PyFrameObject definition to allow -building systemtap with python 3.11. Additional support for python -3.11 is forthcoming. - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=069e109c95d1afca17cd3781b39f220cf8b39978] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - python/HelperSDT/_HelperSDT.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/python/HelperSDT/_HelperSDT.c b/python/HelperSDT/_HelperSDT.c -index 967cb6077..4d287132e 100644 ---- a/python/HelperSDT/_HelperSDT.c -+++ b/python/HelperSDT/_HelperSDT.c -@@ -14,7 +14,13 @@ - // PR25841: ensure that the libHelperSDT.so file contains debuginfo - // for the tapset helper functions, so they don't have to look into libpython* - #include <frameobject.h> -+// python 3.11 removed direct access to PyFrameObject members -+// https://docs.python.org/3.11/whatsnew/3.11.html#c-api-changes -+#if PY_MAJOR_VERSION <= 3 && PY_MINOR_VERSION < 11 - PyFrameObject _dummy_frame; -+#else -+//PyFrameObject *_dummy_frame; -+#endif - #include <object.h> - PyVarObject _dummy_var; - #include <dictobject.h> --- -2.31.1 - diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index b05a5a2b0d..d309a89496 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,13 +1,12 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "0c335a75a789ff44b514e567d458881e15cc283d" -PV = "4.7" +SRCREV = "b176afb2e49119ef844d193d27b0752a6d84fe8f" +PV = "4.8" SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master \ 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://python-3.11.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174533): https://lists.openembedded.org/g/openembedded-core/message/174533 Mute This Topic: https://lists.openembedded.org/mt/95642242/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
