From patchwork Wed May 1 16:00:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 43051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71F2AC27C5F for ; Wed, 1 May 2024 16:00:21 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web11.1119.1714579216857379641 for ; Wed, 01 May 2024 09:00:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=f0/JQawv; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=Z7RVBf+M; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018f34e29720-3d6965e2-66ec-4020-a56a-7eb4e26fd959-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1714579216; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=Kd9Kx5XdMso6LwNUPH4UgmMgIdKE62cCXa9Ug9hSlPs=; b=f0/JQawvZon8dXUWHWW3VpEg/0kAEc5UThqoSOnP3zT2gtlbidT5vW28TXn7b3PG cB+e1f4uiEHEsQufEGFHMEHCpPytrQeVMz0PWsaseM8H0e/x2dEXc5fPP4pxTVIywlP +cr27xxws3ia7j4FxGv6uoSfeRTERHINa/GpBih4= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1714579216; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=Kd9Kx5XdMso6LwNUPH4UgmMgIdKE62cCXa9Ug9hSlPs=; b=Z7RVBf+MsiA+eUCPLaexHVUqNRQLHQyexKOhDsqPQJm5X98wwtnoCXPn4ku32A0r gvyNbS1CJ6qArLqyMGAJaFGNuUHH7wjfW3CHmfcpQfZCho1dj5rBRDhGt3dEibwFGA6 EdLPzNi0Wy6nNKvaW5KILCDNwwmX1YNEVxmqZdK4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Victor Kamensky Cc: openembedded-core@lists.openembedded.org Subject: [AUH] systemtap: upgrading to 5.1 FAILED Message-ID: <0101018f34e29720-3d6965e2-66ec-4020-a56a-7eb4e26fd959-000000@us-west-2.amazonses.com> Date: Wed, 1 May 2024 16:00:16 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.05.01-54.240.27.191 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 01 May 2024 16:00:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198853 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *systemtap* to *5.1* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-systemtap-upgrade-5.0-5.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 0d00fda7ce7b506b869567350dc9b69a22d39166 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Wed, 1 May 2024 13:27:51 +0000 Subject: [PATCH] systemtap: upgrade 5.0 -> 5.1 --- ...gure-write-a-python-location-into-th.patch | 7 +-- ...ython-modules-to-correct-library-dir.patch | 7 +-- ...ve-runtime-linux-uprobes-and-runtime.patch | 40 --------------- ...x-fix-build-against-upcoming-gcc-14-.patch | 40 --------------- ...-broken-libdebuginfod-library-auto-d.patch | 51 ------------------- ...rove-reproducibility-for-c-compiling.patch | 7 +-- .../0001-prerelease-datestamp-fixes.patch | 23 --------- ...staprun-address-ncurses-6.3-failures.patch | 11 ++-- ...d-against-upcoming-gcc-14-Werror-cal.patch | 36 ------------- ...-don-t-support-installing-a-non-root.patch | 17 +++---- .../recipes-kernel/systemtap/systemtap_git.bb | 5 +- .../systemtap/systemtap_git.inc | 4 +- 12 files changed, 24 insertions(+), 224 deletions(-) delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch 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..412f95ac60 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 d3dc317e32ef5a38e054843a3707ff096d5648b6 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..f2fede2a2c 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 0a7dd304e5be14df24e16fa1d1f86d1b73962433 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 a254480f9..578602fdd 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = subdir-objects @@ -51,6 +51,3 @@ index a254480..578602f 100644 --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-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch deleted file mode 100644 index 2d46a3962d..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5a01e28bd806326b2143e3e6bb28d4780c5d879d Mon Sep 17 00:00:00 2001 -From: Victor Kamensky -Date: Sun, 3 Dec 2023 18:40:05 -0800 -Subject: [PATCH] Makefile.am: remove runtime/linux/uprobes and - runtime/linux/uprobes2 install - -"PR30434 continuation: Removed old uprobes, uprobes2 implementation, -uprobes-inc.h & any mentions of CONFIG_UTRACE." commit removed uprobes, -and uprobes2 sources and directories, but Makefile.am still tries to -install them. In fact after failing to 'cd' into runtime/linux/uprobes -directory it copies top level *.[ch] files into -${prefix}/share/systemtap/runtime/linux/uprobes directory. - -The issue was caught by OpenEmbedded project do_package_qa checks. - -Signed-off-by: Victor Kamensky - -Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2023q4/027880.html] ---- - Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5737c6b20..2ba896088 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -277,10 +277,6 @@ endif - do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/softfloat/$$f; done) - (cd $(srcdir)/runtime/linux; for f in *.[ch]; \ - do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/$$f; done) -- (cd $(srcdir)/runtime/linux/uprobes; for f in Makefile *.[ch]; \ -- do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes/$$f; done) -- (cd $(srcdir)/runtime/linux/uprobes2; for f in *.[ch]; \ -- do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes2/$$f; done) - (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name '*.stpm' -o -name README \) -print \ - | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) - (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ --- -2.31.1 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch b/meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch deleted file mode 100644 index e3d94d9312..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-bpf-translate.cxx-fix-build-against-upcoming-gcc-14-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d42139cf9cd26d0c0363fcfe007716baeb8de517 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Fri, 22 Dec 2023 19:42:38 +0000 -Subject: [PATCH] bpf-translate.cxx: fix build against upcoming `gcc-14` - (`-Werror=calloc-transposed-args`) - -`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It -detected minor infelicity in `calloc()` API usage in `systemtap`: - - bpf-translate.cxx: In function 'bpf::BPF_Section* bpf::output_probe(BPF_Output&, program&, const std::string&, unsigned int)': - bpf-translate.cxx:5044:39: error: 'void* calloc(size_t, size_t)' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] - 5044 | bpf_insn *buf = (bpf_insn*) calloc (sizeof(bpf_insn), ninsns); - | ^~~~~~~~~~~~~~~~ - bpf-translate.cxx:5044:39: note: earlier argument should specify number of elements, later size of each element - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=d42139cf9cd26d0c0363fcfe007716baeb8de517] -Signed-off-by: Khem Raj ---- - bpf-translate.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bpf-translate.cxx b/bpf-translate.cxx -index 1a9302463..aa8ef65ce 100644 ---- a/bpf-translate.cxx -+++ b/bpf-translate.cxx -@@ -5041,9 +5041,9 @@ output_probe(BPF_Output &eo, program &prog, - } - } - -- bpf_insn *buf = (bpf_insn*) calloc (sizeof(bpf_insn), ninsns); -+ bpf_insn *buf = (bpf_insn*) calloc (ninsns, sizeof(bpf_insn)); - assert (buf); -- Elf64_Rel *rel = (Elf64_Rel*) calloc (sizeof(Elf64_Rel), nreloc); -+ Elf64_Rel *rel = (Elf64_Rel*) calloc (nreloc, sizeof(Elf64_Rel)); - assert (rel); - - unsigned i = 0, r = 0; --- -2.43.0 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch b/meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch deleted file mode 100644 index 98641826f6..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-configure.ac-fix-broken-libdebuginfod-library-auto-d.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3913ad3e28a19811e1b52338112344a487057e4f Mon Sep 17 00:00:00 2001 -From: Victor Kamensky -Date: Mon, 18 Dec 2023 03:13:38 +0000 -Subject: [PATCH 1/2] configure.ac: fix broken libdebuginfod library auto - detection - -After 2e67b053e3796ee7cf29a39f9698729b52078406 "configury: rework debuginfod searches" -commit, libdebuginfod.so library auto detection is broken. It was reported by Martin Jansa -on openembedded-core mailing list [1]. - -Currently configure.ac does "AC_DEFINE([HAVE_LIBDEBUGINFOD], [1] ..." as long as -no --without-debuginfod option is passed, regardless PKG_CHECK_MODULES check result. -It seems to be bad copy/paste. Address the issue by moving the AC_DEFINE back to -PKG_CHECK_MODULES action-if-found block. - -To reproduce the issue on FC system, one can do the following -"sudo dnf remove elfutils-debuginfod-client-devel" and then try to build SystemTap -util.cxx will fail to compile because of missing elfutils/debuginfod.h because -config.h will have "#define HAVE_LIBDEBUGINFOD 1", while config.log and configure -output indicates that check for libdebuginfod library failed. - -[1] https://lists.openembedded.org/g/openembedded-core/message/192109?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C0%2Csystemtap%2C20%2C2%2C0%2C102987514 - -Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2023q4/027914.html] -Signed-off-by: Victor Kamensky ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d9559c5c3..18cd7f84a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -219,12 +219,11 @@ dnl take the user at his or her word - elif test "x$with_debuginfod" != xno; then - dnl check in the system pkgconfig - PKG_CHECK_MODULES([debuginfod], [libdebuginfod >= 0.179], -- [have_debuginfod=1], -+ [have_debuginfod=1 -+ AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], [Define to 1 if debuginfod is enabled.])], - [if test "x$with_debuginfod" = xyes; then - AC_MSG_ERROR(["--with-debuginfod was given, but libdebuginfod is missing or unusable."]) - fi]) -- AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], [Define to 1 if debuginfod is enabled.]) -- AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi --- -2.31.1 - 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..51f088ac85 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 27dec5c68e09e96ce73aecbc656384151fbe0071 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-prerelease-datestamp-fixes.patch b/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch deleted file mode 100644 index afdc10a3fe..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch +++ /dev/null @@ -1,23 +0,0 @@ -From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" -Date: Sat, 4 Nov 2023 12:19:59 -0400 -Subject: [PATCH] prerelease datestamp fixes - -Upstream-Status: Backport ---- - NEWS | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index c7f31e8b7..f0f9056c4 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,4 +1,4 @@ --* What's new in version 5.0, 2023-11-03 -+* What's new in version 5.0, 2023-11-04 - - - Performance improvements in uprobe registration and module startup. - --- -2.31.1 - 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..c52e31d435 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 039819ca1cfab8b7b5ef77cc437baf8e946b9441 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-fix-build-against-upcoming-gcc-14-Werror-cal.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch deleted file mode 100644 index 22578fb3f6..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-fix-build-against-upcoming-gcc-14-Werror-cal.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 52596f023652114642faba5726c99488529029ce Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Thu, 21 Dec 2023 10:00:06 +0000 -Subject: [PATCH] staprun: fix build against upcoming `gcc-14` - (`-Werror=calloc-transposed-args`) - -`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It -detected minor infelicity in `calloc()` API usage in `systemtap`: - - staprun.c: In function 'main': - staprun.c:550:50: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] - 550 | char ** new_argv = calloc(sizeof(char *),argc+2); - | ^~~~ - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=52596f023652114642faba5726c99488529029ce] -Signed-off-by: Khem Raj ---- - staprun/staprun.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/staprun/staprun.c b/staprun/staprun.c -index 8437f3af6..d1b0b221b 100644 ---- a/staprun/staprun.c -+++ b/staprun/staprun.c -@@ -547,7 +547,7 @@ int main(int argc, char **argv) - us to extend argv[], with all the C fun that entails. */ - #ifdef HAVE_OPENAT - if (relay_basedir_fd >= 0) { -- char ** new_argv = calloc(sizeof(char *),argc+2); -+ char ** new_argv = calloc(argc+2, sizeof(char *)); - const int new_Foption_size = 10; /* -FNNNNN */ - char * new_Foption = malloc(new_Foption_size); - int i; --- -2.43.0 - 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..db029e0146 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 77b359d64264f536210fed4c3c54737a1ed22502 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 c574bcb2ba..e859109356 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 = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" -PV = "5.0" +SRCREV = "3a0c9c15163520dd0d9ab07177da62ce9cc2332f" +PV = "5.1" 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 \