* removed upstreamed patch * fixed patch fuzz issue Signed-off-by: Victor Kamensky <[email protected]> --- ...-native_5.3.bb => systemtap-native_5.4.bb} | 0 ...ython-modules-to-correct-library-dir.patch | 6 ++-- ...am-use-absolute-path-for-source-dire.patch | 36 ------------------- .../{systemtap_5.3.bb => systemtap_5.4.bb} | 1 - .../systemtap/systemtap_git.inc | 2 +- 5 files changed, 4 insertions(+), 41 deletions(-) rename meta/recipes-kernel/systemtap/{systemtap-native_5.3.bb => systemtap-native_5.4.bb} (100%) delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch rename meta/recipes-kernel/systemtap/{systemtap_5.3.bb => systemtap_5.4.bb} (97%)
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_5.3.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.4.bb similarity index 100% rename from meta/recipes-kernel/systemtap/systemtap-native_5.3.bb rename to meta/recipes-kernel/systemtap/systemtap-native_5.4.bb diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch index ee9baedcda..21e3096405 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch @@ -1,4 +1,4 @@ -From 18d088d10c1a0885fa25ac40591e38c8aa545c81 Mon Sep 17 00:00:00 2001 +From 7847240a97f5010ebab775f7ac51812a7705a886 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 24 Feb 2017 17:53:02 +0200 Subject: [PATCH] Install python modules to correct library dir. @@ -19,11 +19,11 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am -index 13618dc2f..9d5cb7bcb 100644 +index 845db3661..130e90b24 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = subdir-objects - AM_CPPFLAGS = -I$(srcdir)/../includes + AM_CPPFLAGS = -I$(abs_srcdir)/../includes AM_CPPFLAGS += -I$(abs_builddir)/../includes/sys +# Add OE's CFLAGS which contains `-fdebug-prefix-map' options to 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 deleted file mode 100644 index dacd19edd1..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 71e4ffd46dbbb7de1d06edb66f3e1fe0de423586 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 21 May 2025 13:25:46 +0200 -Subject: [PATCH] python/Makefile.am: use absolute path for source directory - includes as well - -Otherwise it would be relative to the build directory, -which works only if the build and source directory are in the -same parent directory, and breaks if they're on different levels. - -Upstream-Status: Submitted [by email to [email protected],[email protected],[email protected]] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - python/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/Makefile.am b/python/Makefile.am -index 9d5cb7bcb..130e90b24 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -2,10 +2,10 @@ - - AUTOMAKE_OPTIONS = subdir-objects - --# Note that we have to use 'abs_builddir' here since we change -+# Note that we have to use absolute directores here since we change - # directories back to the source directory when building the python - # extension. --AM_CPPFLAGS = -I$(srcdir)/../includes -+AM_CPPFLAGS = -I$(abs_srcdir)/../includes - AM_CPPFLAGS += -I$(abs_builddir)/../includes/sys - - # Add OE's CFLAGS which contains `-fdebug-prefix-map' options to --- -2.39.5 - diff --git a/meta/recipes-kernel/systemtap/systemtap_5.3.bb b/meta/recipes-kernel/systemtap/systemtap_5.4.bb similarity index 97% rename from meta/recipes-kernel/systemtap/systemtap_5.3.bb rename to meta/recipes-kernel/systemtap/systemtap_5.4.bb index 588b3b8d36..254bac4d6f 100644 --- a/meta/recipes-kernel/systemtap/systemtap_5.3.bb +++ b/meta/recipes-kernel/systemtap/systemtap_5.4.bb @@ -9,7 +9,6 @@ require systemtap_git.inc SRC_URI += " \ file://0001-improve-reproducibility-for-c-compiling.patch \ file://0001-staprun-address-ncurses-6.3-failures.patch \ - file://0001-python-Makefile.am-use-absolute-path-for-source-dire.patch \ " DEPENDS = "elfutils" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index c5d10c8fd5..180ebc9f61 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -7,7 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;t file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ " -SRCREV = "c4fc655170b534478a6b131292b987630c7c0865" +SRCREV = "911a1354aac264651fda932061e7f20d2ecc2471" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux' COMPATIBLE_HOST:libc-musl = 'null' -- 2.45.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228251): https://lists.openembedded.org/g/openembedded-core/message/228251 Mute This Topic: https://lists.openembedded.org/mt/116885722/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
