diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_git.bb index 2690b259c8..251248d119 100644 --- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-native_git.bb @@ -4,3 +4,4 @@ require systemtap_git.bb inherit_defer native addtask addto_recipe_sysroot after do_populate_sysroot before do_build + diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch index 742b1187fc..50fba0a4e0 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch @@ -1,4 +1,4 @@ -From ab29615ed6c2e779b472903564dc683dc1015de7 Mon Sep 17 00:00:00 2001 +From c4239b935d6c732a694b58eb1c7073c5df3392fc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 22 Feb 2017 13:37:33 +0200 Subject: [PATCH] Do not let configure write a python location into the dtrace @@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtrace.in b/dtrace.in -index 5e1cf8079..a24229cbc 100644 +index 73a6f22e2..870999e36 100644 --- a/dtrace.in +++ b/dtrace.in @@ -1,4 +1,4 @@ @@ -20,6 +20,3 @@ index 5e1cf8079..a24229cbc 100644 # vim: et sta sts=4 sw=4 ts=8 # This handles the systemtap equivalent of --- -2.11.0 - 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 48cf4aee85..5ca6e8811a 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 2ada22f05460223924efe54080cb4419e2b4c276 Mon Sep 17 00:00:00 2001 +From 3119fe39b6ba5721024393625b29a4302a5cbd77 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 24 Feb 2017 17:53:02 +0200 Subject: [PATCH] Install python modules to correct library dir. @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am -index a254480..578602f 100644 +index 13618dc2f..9d5cb7bcb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = subdir-objects @@ -35,7 +35,7 @@ index a254480..578602f 100644 pkglibexecpython_PYTHON = @@ -47,7 +51,7 @@ install-exec-local: if HAVE_PYTHON2_PROBES - (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \ + (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \ --build-base $(shell readlink -f $(builddir))/py2build \ - install --prefix $(DESTDIR)$(prefix) \ + install --root $(DESTDIR) --prefix $(prefix) --prefix $(prefix) --install-lib=${pythondir} \ @@ -44,13 +44,10 @@ index a254480..578602f 100644 --verbose) @@ -55,7 +59,7 @@ endif if HAVE_PYTHON3_PROBES - (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \ + (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \ --build-base $(shell readlink -f $(builddir))/py3build \ - install --prefix $(DESTDIR)$(prefix) \ + install --root $(DESTDIR) --prefix $(prefix) --install-lib=${python3dir} \ --single-version-externally-managed \ --record $(shell readlink -f $(builddir))/py3build/install_files.txt \ --verbose) --- -2.7.4 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch deleted file mode 100644 index 0c2888400d..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 91caf37e4dfe862f9b68447b1597c0d0f31523c3 Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" -Date: Tue, 7 May 2024 15:04:04 -0400 -Subject: [PATCH] elaborate.cxx: gcc version compatibility hack redux - -Note __GNUC__ >= 14 for this diagnostic. - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=91caf37e4dfe862f9b68447b1597c0d0f31523c3] -Signed-off-by: Victor Kamensky ---- - elaborate.cxx | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/elaborate.cxx b/elaborate.cxx -index 88505559b..c08023f1d 100644 ---- a/elaborate.cxx -+++ b/elaborate.cxx -@@ -2656,9 +2656,11 @@ symresolution_info::symresolution_info (systemtap_session& s, bool omniscient_un - session (s), unmangled_p(omniscient_unmangled), current_function (0), current_probe (0) - { - #pragma GCC diagnostic push -+ #if __GNUC__ >= 14 - // c10s early snapshot GCC complains about this construct, which is - // made safe via our dtor usage - #pragma GCC diagnostic ignored "-Wdangling-pointer" -+ #endif - saved_session_symbol_resolver = s.symbol_resolver; - s.symbol_resolver = this; // save resolver for early PR25841 function resolution - #pragma GCC diagnostic pop --- -2.45.2 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch deleted file mode 100644 index 7cdcc93f14..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d11241bdd05bc4c745c8aef53a2725331e1a93b4 Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" -Date: Tue, 7 May 2024 14:25:12 -0400 -Subject: [PATCH] elaborate.cxx: gcc version compatibility hack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Suppress -Wdangling-pointer for a construct that appears valid, but -one particular GCC snapshot version complains about. - -In constructor ‘symresolution_info::symresolution_info(systemtap_session&, bool)’, -inlined from ‘int semantic_pass_symbols(systemtap_session&)’ at ../systemtap/elaborate.cxx:1872:28: -../systemtap/elaborate.cxx:2659:21: error: storing the address of local variable ‘sym’ in ‘*s.systemtap_session::symbol_resolver’ [-Werror=dangling-pointer=] - 2659 | s.symbol_resolver = this; // save resolver for early PR25841 function resolution - | ~~~~~~~~~~~~~~~~~~^~~~~~ -../systemtap/elaborate.cxx: In function ‘int semantic_pass_symbols(systemtap_session&)’: -../systemtap/elaborate.cxx:1872:22: note: ‘sym’ declared here - 1872 | symresolution_info sym (s); - | ^~~ -../systemtap/elaborate.cxx:1870:43: note: ‘s’ declared here - 1870 | semantic_pass_symbols (systemtap_session& s) - | ~~~~~~~~~~~~~~~~~~~^ -cc1plus: all warnings being treated as errors - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=d11241bdd05bc4c745c8aef53a2725331e1a93b4] -Signed-off-by: Victor Kamensky ---- - elaborate.cxx | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/elaborate.cxx b/elaborate.cxx -index 8bf9e6c06..88505559b 100644 ---- a/elaborate.cxx -+++ b/elaborate.cxx -@@ -2655,8 +2655,13 @@ semantic_pass (systemtap_session& s) - symresolution_info::symresolution_info (systemtap_session& s, bool omniscient_unmangled): - session (s), unmangled_p(omniscient_unmangled), current_function (0), current_probe (0) - { -+ #pragma GCC diagnostic push -+ // c10s early snapshot GCC complains about this construct, which is -+ // made safe via our dtor usage -+ #pragma GCC diagnostic ignored "-Wdangling-pointer" - saved_session_symbol_resolver = s.symbol_resolver; - s.symbol_resolver = this; // save resolver for early PR25841 function resolution -+ #pragma GCC diagnostic pop - } - - --- -2.45.2 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch index 15a6f2a9a5..7538755061 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch @@ -1,4 +1,4 @@ -From 6288ba5df0a8c73ef842b609081449ac4de86123 Mon Sep 17 00:00:00 2001 +From ee882092f6ffa5413e90a290b56ca53b4bafbe12 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 18 Jul 2018 16:58:33 +0800 Subject: [PATCH] improve reproducibility for c++ compiling @@ -14,7 +14,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stringtable.h b/stringtable.h -index 5fc42e7..6fd8a1e 100644 +index 5fc42e7ab..6fd8a1e26 100644 --- a/stringtable.h +++ b/stringtable.h @@ -19,7 +19,7 @@ @@ -26,6 +26,3 @@ index 5fc42e7..6fd8a1e 100644 // XXX: experimental tunables #define INTERNED_STRING_FIND_MEMMEM 1 /* perf stat indicates a very slight benefit */ --- -2.7.4 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch index 1decf21593..a3af6d7a45 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch @@ -1,4 +1,4 @@ -From 191f528da19193d713d94ee252e2485efd9af4d3 Mon Sep 17 00:00:00 2001 +From 0173d2a8fb3a6c9cbab2020f4ecc0642724f8a57 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 25 Oct 2021 17:59:24 +0200 Subject: [PATCH] staprun: address ncurses 6.3 failures @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/staprun/monitor.c b/staprun/monitor.c -index 478634c09..f4fbfd686 100644 +index 851ee14c4..7d83a3846 100644 --- a/staprun/monitor.c +++ b/staprun/monitor.c -@@ -448,12 +448,12 @@ void monitor_render(void) +@@ -453,12 +453,12 @@ void monitor_render(void) if (active_window == 0) wattron(status, A_BOLD); wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", @@ -32,7 +32,7 @@ index 478634c09..f4fbfd686 100644 HIGHLIGHT("name", p_name, comp_fn_index)); if (active_window == 0) wattroff(status, A_BOLD); -@@ -466,17 +466,17 @@ void monitor_render(void) +@@ -471,17 +471,17 @@ void monitor_render(void) json_object *probe, *field; probe = json_object_array_get_idx(jso_probe_list, i); json_object_object_get_ex(probe, "index", &field); @@ -56,6 +56,3 @@ index 478634c09..f4fbfd686 100644 getyx(status, discard, cur_x); json_object_object_get_ex(probe, "name", &field); wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); --- -2.20.1 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch index e2f8b3b057..f04b6d8a1f 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch @@ -1,4 +1,4 @@ -From 3e13a006fe3dff9489269274093bf868532036e2 Mon Sep 17 00:00:00 2001 +From 96a6d8cfd889d702d1df7b1ac544051f9cec727b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 5 Sep 2017 16:02:55 -0700 Subject: [PATCH] staprun/stapbpf: don't support installing a non-root @@ -10,15 +10,14 @@ the binaries. Upstream-Status: Inappropriate [Embedded] Signed-off-by: Saul Wold --- - stapbpf/Makefile.am | 14 +++++++------- - staprun/Makefile.am | 12 ++++++------ - 2 files changed, 13 insertions(+), 13 deletions(-) + stapbpf/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) -Index: git/stapbpf/Makefile.am -=================================================================== ---- git.orig/stapbpf/Makefile.am -+++ git/stapbpf/Makefile.am -@@ -41,10 +41,10 @@ +diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am +index bb0c1eef8..323003b88 100644 +--- a/stapbpf/Makefile.am ++++ b/stapbpf/Makefile.am +@@ -40,10 +40,10 @@ git_version.stamp ../git_version.h: # Why the "id -u" condition? This way, an unprivileged user can run # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later. diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 68f5c76428..01c87a5727 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -6,7 +6,10 @@ HOMEPAGE = "https://sourceware.org/systemtap/" require systemtap_git.inc -SRC_URI += " \ +SRC_URI += "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ + 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-improve-reproducibility-for-c-compiling.patch \ file://0001-staprun-address-ncurses-6.3-failures.patch \ " diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 80945ad7f8..bc8f9ba9d8 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,7 +1,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "3a0c9c15163520dd0d9ab07177da62ce9cc2332f" -PV = "5.1" +SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" +PV = "5.2" SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \