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
@@ -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 <alex.kanavin@gmail.com>
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 <hongxu.jia@windriver.com>
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
new file mode 100644
@@ -0,0 +1,104 @@
+From 94efb7c4eb02de0e3565cb165b53963602d3dcb6 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 30 Nov 2025 20:58:01 +0000
+Subject: [PATCH] elaborate.cxx: fix 32-bit build
+
+Without the change the build fails on i686-linux as:
+
+ elaborate.cxx:5119:33: error:
+ format '%ld' expects argument of type 'long int',
+ but argument 2 has type 'int64_t' {aka 'long long int'} [-Werror=format=]
+ 5119 | session.print_warning (_F("Collapsing unresolved @define to %ld [stapprobes]", value), e->tok);
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=patch;h=94efb7c4eb02de0e3565cb165b53963602d3dcb6]
+Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
+---
+ elaborate.cxx | 2 +-
+ po/cs.po | 2 +-
+ po/en.po | 2 +-
+ po/fr.po | 2 +-
+ po/pl.po | 2 +-
+ po/systemtap.pot | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/elaborate.cxx b/elaborate.cxx
+index 93ecffa1a..3ad3614e7 100644
+--- a/elaborate.cxx
++++ b/elaborate.cxx
+@@ -5116,7 +5116,7 @@ const_folder::visit_defined_op (defined_op* e)
+ // Don't be greedy... we'll only collapse one at a time so type
+ // resolution can have another go at it.
+ relaxed_p = false;
+- session.print_warning (_F("Collapsing unresolved @define to %ld [stapprobes]", value), e->tok);
++ session.print_warning (_F("Collapsing unresolved @define to %lld [stapprobes]", (long long)value), e->tok);
+ literal_number* n = new literal_number (value);
+ n->tok = e->tok;
+ n->visit (this);
+diff --git a/po/cs.po b/po/cs.po
+index df6412772..92fdef7ad 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -2039,7 +2039,7 @@ msgstr "Zahazuji kontrolu '@defined' bez vedlejších účinků "
+
+ #: elaborate.cxx:5119
+ #, fuzzy, c-format
+-msgid "Collapsing unresolved @define to %ld [stapprobes]"
++msgid "Collapsing unresolved @define to %lld [stapprobes]"
+ msgstr "Zahazuji kontrolu '@defined' bez vedlejších účinků "
+
+ #: elaborate.cxx:5127
+diff --git a/po/en.po b/po/en.po
+index 8847639e8..1db2292bd 100644
+--- a/po/en.po
++++ b/po/en.po
+@@ -2050,7 +2050,7 @@ msgstr ""
+
+ #: elaborate.cxx:5119
+ #, c-format
+-msgid "Collapsing unresolved @define to %ld [stapprobes]"
++msgid "Collapsing unresolved @define to %lld [stapprobes]"
+ msgstr ""
+
+ #: elaborate.cxx:5127
+diff --git a/po/fr.po b/po/fr.po
+index b8677707b..55e409919 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -2090,7 +2090,7 @@ msgstr ""
+
+ #: elaborate.cxx:5119
+ #, c-format
+-msgid "Collapsing unresolved @define to %ld [stapprobes]"
++msgid "Collapsing unresolved @define to %lld [stapprobes]"
+ msgstr ""
+
+ #: elaborate.cxx:5127
+diff --git a/po/pl.po b/po/pl.po
+index e3b6700ee..0b35880c1 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -1977,7 +1977,7 @@ msgstr ""
+
+ #: elaborate.cxx:5119
+ #, c-format
+-msgid "Collapsing unresolved @define to %ld [stapprobes]"
++msgid "Collapsing unresolved @define to %lld [stapprobes]"
+ msgstr ""
+
+ #: elaborate.cxx:5127
+diff --git a/po/systemtap.pot b/po/systemtap.pot
+index 32ddb2290..4ec0d9a8c 100644
+--- a/po/systemtap.pot
++++ b/po/systemtap.pot
+@@ -1973,7 +1973,7 @@ msgstr ""
+
+ #: elaborate.cxx:5119
+ #, c-format
+-msgid "Collapsing unresolved @define to %ld [stapprobes]"
++msgid "Collapsing unresolved @define to %lld [stapprobes]"
+ msgstr ""
+
+ #: elaborate.cxx:5127
+--
+2.45.0
+
deleted file mode 100644
@@ -1,36 +0,0 @@
-From 71e4ffd46dbbb7de1d06edb66f3e1fe0de423586 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-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 fche@redhat.com,wcohen@redhat.com,systemtap@sourceware.org]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- 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
-
similarity index 97%
rename from meta/recipes-kernel/systemtap/systemtap_5.3.bb
rename to 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"
@@ -5,9 +5,10 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;t
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://0001-elaborate.cxx-fix-32-bit-build.patch \
"
-SRCREV = "c4fc655170b534478a6b131292b987630c7c0865"
+SRCREV = "911a1354aac264651fda932061e7f20d2ecc2471"
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux'
COMPATIBLE_HOST:libc-musl = 'null'
* removed upstreamed patch * fixed patch fuzz issue * backport 32bit build fix Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com> --- ...-native_5.3.bb => systemtap-native_5.4.bb} | 0 ...ython-modules-to-correct-library-dir.patch | 6 +- .../0001-elaborate.cxx-fix-32-bit-build.patch | 104 ++++++++++++++++++ ...am-use-absolute-path-for-source-dire.patch | 36 ------ .../{systemtap_5.3.bb => systemtap_5.4.bb} | 1 - .../systemtap/systemtap_git.inc | 3 +- 6 files changed, 109 insertions(+), 41 deletions(-) rename meta/recipes-kernel/systemtap/{systemtap-native_5.3.bb => systemtap-native_5.4.bb} (100%) create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-fix-32-bit-build.patch 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%)