Skip to contentSkip to conversation

systemtap: Upgrade 5.5 -> 5.6

PATCH Superseded Jaipaul Cheernam 3 participants 5 messages Sep 19 – Sep 20

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemtap: Upgrade 5.5 -> 5.6

NEWS: https://sourceware.org/git/?p=systemtap.git;a=blob;f=NEWS;hb=release-5.6

- Clean up python2 support in recipe and clean up obsoloute patch More details [1], [2]

- Added pip/wheel native to the python3-probes PACKAGECONFIG — the new build uses pip/wheel

- Added two patches to keep do_package_qa passing. The generated tapset/python3.stpm recorded the recipe-sysroot path of libpython, since it comes from sysconfig's LIBDIR and python3targetconfig points that at ${STAGING_LIBDIR}; @cast module names are resolved verbatim with no --sysroot translation, so that path also made python3 probes unresolvable on the target. The pip-installed HelperSDT module shipped __pycache__/*.pyc naming ${D} and a dist-info/direct_url.json naming the wheel in ${B}, both artifacts of "pip install --root". Reported upstream as PR34652 [3], patches posted to the systemtap list [4].

[1] https://sourceware.org/git/?p=systemtap.git;a=commit;h=3c9c8a8163e0a9c77bf9a3a7f87ceaf2d3de98b5
[2] https://sourceware.org/git/?p=systemtap.git;a=commit;h=55a0168613e765f6be5257b0c4fb97678292716f
[3] https://sourceware.org/bugzilla/show_bug.cgi?id=34652
[4] https://inbox.sourceware.org/systemtap/[email protected]/

---
 ...-native_5.5.bb => systemtap-native_5.6.bb} |  0
 ...gure-write-a-python-location-into-th.patch |  2 +-
 ...ython-modules-to-correct-library-dir.patch | 53 -----------------
 ...rove-reproducibility-for-c-compiling.patch |  2 +-
 ...-record-the-installed-libpython-path.patch | 58 +++++++++++++++++++
 ...staprun-address-ncurses-6.3-failures.patch |  2 +-
 ...-don-t-support-installing-a-non-root.patch |  6 +-
 ...t-install-build-paths-with-the-wheel.patch | 49 ++++++++++++++++
 .../systemtap/systemtap/readline.patch        |  6 +-
 .../{systemtap_5.5.bb => systemtap_5.6.bb}    |  6 +-
 .../systemtap/systemtap_git.inc               |  3 +-
 11 files changed, 121 insertions(+), 66 deletions(-)
 rename meta/recipes-kernel/systemtap/{systemtap-native_5.5.bb => systemtap-native_5.6.bb} (100%)
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-python3.stpm-record-the-installed-libpython-path.patch
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/0002-python-don-t-install-build-paths-with-the-wheel.patch
 rename meta/recipes-kernel/systemtap/{systemtap_5.5.bb => systemtap_5.6.bb} (94%)
meta/recipes-kernel/systemtap/systemtap-native_5.6.bb renamed from meta/recipes-kernel/systemtap/systemtap-native_5.5.bb +0 -0
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap-native_5.5.bb
rename to meta/recipes-kernel/systemtap/systemtap-native_5.6.bb
meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch +1 -1
index 8a6cc4e0a4..392950631e 100644
@@ -1,4 +1,4 @@
-From adf505ededdd25cf43111fd12a59090a8f7de856 Mon Sep 17 00:00:00 2001
+From cba033a67d6d977cb5fa3862c4d3daa2eede08ba Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 22 Feb 2017 13:37:33 +0200
 Subject: [PATCH] Do not let configure write a python location into the dtrace
meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +1 -1
index 894cd3b407..970079ebcf 100644
@@ -1,4 +1,4 @@
-From 06522edad080caa76f5abc8586fe5baf3b620f16 Mon Sep 17 00:00:00 2001
+From e39dbf74b501632bc3e9761eb95894dc1c6b2d86 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Wed, 18 Jul 2018 16:58:33 +0800
 Subject: [PATCH] improve reproducibility for c++ compiling
meta/recipes-kernel/systemtap/systemtap/0001-python3.stpm-record-the-installed-libpython-path.patch new file +58 -0

58 lines not on this page · raw message

meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch +1 -1
index 59c0e8a7fd..e58053c864 100644
@@ -1,4 +1,4 @@
-From 7672d0e398b29a52f59a1a0cbb75d4d07bd5f975 Mon Sep 17 00:00:00 2001
+From 949a5670611b67f070c58423c9f88b8837aaf443 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 25 Oct 2021 17:59:24 +0200
 Subject: [PATCH] staprun: address ncurses 6.3 failures
meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch +3 -3
index 8273e34b57..7bf723d5d3 100644
@@ -1,4 +1,4 @@
-From 3483d0bc400eb618add607097027eafb075722f4 Mon Sep 17 00:00:00 2001
+From f0150581619d331522a7f26fb24b445c4f305fa0 Mon Sep 17 00:00:00 2001
 From: Saul Wold <[email protected]>
 Date: Tue, 5 Sep 2017 16:02:55 -0700
 Subject: [PATCH] staprun/stapbpf: don't support installing a non-root
@@ -14,10 +14,10 @@ Signed-off-by: Saul Wold <[email protected]>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am
-index 4bd116bc3..e06d0801b 100644
+index 962b2dbec..ac24b7997 100644
 --- a/stapbpf/Makefile.am
 +++ b/stapbpf/Makefile.am
-@@ -40,10 +40,10 @@ git_version.stamp ../git_version.h:
+@@ -56,10 +56,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.
meta/recipes-kernel/systemtap/systemtap/0002-python-don-t-install-build-paths-with-the-wheel.patch new file +49 -0

49 lines not on this page · raw message

meta/recipes-kernel/systemtap/systemtap/readline.patch +3 -3
index f452188179..f59f5bcb7f 100644
@@ -1,4 +1,4 @@
-From ee20cb1c1ca0337c56087934efbd66ba30d2d5c3 Mon Sep 17 00:00:00 2001
+From 6bd6439042b9fc1155568e8a476257925424b7cb Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 13 Apr 2026 11:28:39 +0100
 Subject: [PATCH] configure: add option to enable/disable readline
@@ -18,10 +18,10 @@ Signed-off-by: Ross Burton <[email protected]>
  1 file changed, 38 insertions(+), 29 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6fb99da40..2ec72e85a 100644
+index 5bfc86f92..c1835ea51 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -525,38 +525,47 @@ AC_CHECK_HEADERS([rpm/rpmcrypto.h], [
+@@ -526,38 +526,47 @@ AC_CHECK_HEADERS([rpm/rpmcrypto.h], [
                        have_rpmcrypto_h=yes
  		      AC_MSG_NOTICE([separate rpm/rpmcrypto.h])])
  
meta/recipes-kernel/systemtap/systemtap_5.6.bb renamed from meta/recipes-kernel/systemtap/systemtap_5.5.bb +4 -2
similarity index 94%
rename from meta/recipes-kernel/systemtap/systemtap_5.5.bb
rename to meta/recipes-kernel/systemtap/systemtap_5.6.bb
index 980c09d049..f0b14ef90a 100644
@@ -9,6 +9,8 @@ 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-python3.stpm-record-the-installed-libpython-path.patch \
+           file://0002-python-don-t-install-build-paths-with-the-wheel.patch \
            "
 
 DEPENDS = "elfutils"
@@ -16,7 +18,7 @@ DEPENDS = "elfutils"
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi --without-dyninst \
             --disable-server --disable-grapher --enable-prologues \
-            --with-python3 --without-python2-probes \
+            --with-python3 \
             --with-extra-version="oe" \
             ac_cv_prog_have_javac=no \
             ac_cv_prog_have_jar=no "
@@ -30,7 +32,7 @@ PACKAGECONFIG[translator] = "--enable-translator,--disable-translator,boost,bash
 PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt"
 PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3"
 PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c"
-PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native"
+PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native python3-pip-native python3-wheel-native"
 PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod"
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 
meta/recipes-kernel/systemtap/systemtap_git.inc +1 -2
index 7845905d10..9a12050e00 100644
@@ -3,12 +3,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;tag=release-${PV} \
            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://readline.patch \
            "
 
-SRCREV = "90b164cf106ef16f873ab58c8c6f653718bb6e17"
+SRCREV = "211e84349504077f0c84f759601b02f946465d29"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'
#1 lore raw

Patchtest results for [PATCH] systemtap: Upgrade 5.5 -> 5.6

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/systemtap-Upgrade-5.5---5.6.patch

FAIL: test commit message user tags: Mbox includes one or more GitHub-style username tags. Ensure that any "@" symbols are stripped out of usernames (test_mbox.TestMbox.test_commit_message_user_tags)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test auh changelog truncation notice (test_mbox.TestMbox.test_auh_changelog_truncation_notice)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#2 lore raw
In reply to Jaipaul Cheernam
Quoted 18 lines · Jaipaul Cheernam via lists.openembedded.org

NEWS: https://sourceware.org/git/?p=systemtap.git;a=blob;f=NEWS;hb=release-5.6

- Clean up python2 support in recipe and clean up obsoloute patch More details [1], [2]

- Added pip/wheel native to the python3-probes PACKAGECONFIG — the new build uses pip/wheel

- Added two patches to keep do_package_qa passing. The generated tapset/python3.stpm recorded the recipe-sysroot path of libpython, since it comes from sysconfig's LIBDIR and python3targetconfig points that at ${STAGING_LIBDIR}; @cast module names are resolved verbatim with no --sysroot translation, so that path also made python3 probes unresolvable on the target. The pip-installed HelperSDT module shipped __pycache__/*.pyc naming ${D} and a dist-info/direct_url.json naming the wheel in ${B}, both artifacts of "pip install --root". Reported upstream as PR34652 [3], patches posted to the systemtap list [4].

Quoted 6 lines

[1] https://sourceware.org/git/?p=systemtap.git;a=commit;h=3c9c8a8163e0a9c77bf9a3a7f87ceaf2d3de98b5
[2] https://sourceware.org/git/?p=systemtap.git;a=commit;h=55a0168613e765f6be5257b0c4fb97678292716f
[3] https://sourceware.org/bugzilla/show_bug.cgi?id=34652
[4] https://inbox.sourceware.org/systemtap/[email protected]/

I think there may be a reproducibilty issue in there:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/5022

https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260919-l3njlk0p/packages/diff-html/

Cheers,

Richard

#3 lore raw

PATCH v2 1/1 systemtap: Upgrade 5.5 -> 5.6

In reply to Jaipaul Cheernam

NEWS: https://sourceware.org/git/?p=systemtap.git;a=blob;f=NEWS;hb=release-5.6

- Clean up python2 support in recipe and clean up obsoloute patch More details [1], [2]

- Added pip/wheel native to the python3-probes PACKAGECONFIG — the new build uses pip/wheel

- Added two patches to keep do_package_qa passing and the packages reproducible. The generated tapset/python3.stpm recorded the recipe-sysroot path of libpython, since it comes from sysconfig's LIBDIR and python3targetconfig points that at ${STAGING_LIBDIR}; @cast module names are resolved verbatim with no --sysroot translation, so that path also made python3 probes unresolvable on the target. The pip-installed HelperSDT module shipped __pycache__/*.pyc naming ${D} and a dist-info/direct_url.json naming the wheel in ${B}, both artifacts of "pip install --root"; direct_url.json's entry in dist-info/RECORD goes too, since its sha256 covers that build path and kept RECORD varying between builds. Reported upstream as PR34652 [3], patches posted to the systemtap list [4].

[1] https://sourceware.org/git/?p=systemtap.git;a=commit;h=3c9c8a8163e0a9c77bf9a3a7f87ceaf2d3de98b5
[2] https://sourceware.org/git/?p=systemtap.git;a=commit;h=55a0168613e765f6be5257b0c4fb97678292716f
[3] https://sourceware.org/bugzilla/show_bug.cgi?id=34652
[4] https://inbox.sourceware.org/systemtap/[email protected]/

---
v2: update 0002-python-don-t-install-build-paths-with-the-wheel.patch to
drop the direct_url.json line from dist-info/RECORD as well. v1 left an entry whose sha256 covers the deleted file, and so the build path inside it, leaving systemtap-python unreproducible; the autobuilder caught helpersdt-0.1.0.dist-info/RECORD differing between the two builds:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/5022
No other change; 0001 is unmodified.

 ...-native_5.5.bb => systemtap-native_5.6.bb} |  0
 ...gure-write-a-python-location-into-th.patch |  2 +-
 ...ython-modules-to-correct-library-dir.patch | 53 ----------------
 ...rove-reproducibility-for-c-compiling.patch |  2 +-
 ...-record-the-installed-libpython-path.patch | 58 ++++++++++++++++++
 ...staprun-address-ncurses-6.3-failures.patch |  2 +-
 ...-don-t-support-installing-a-non-root.patch |  6 +-
 ...t-install-build-paths-with-the-wheel.patch | 61 +++++++++++++++++++
 .../systemtap/systemtap/readline.patch        |  6 +-
 .../{systemtap_5.5.bb => systemtap_5.6.bb}    |  6 +-
 .../systemtap/systemtap_git.inc               |  3 +-
 11 files changed, 133 insertions(+), 66 deletions(-)
 rename meta/recipes-kernel/systemtap/{systemtap-native_5.5.bb => systemtap-native_5.6.bb} (100%)
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-python3.stpm-record-the-installed-libpython-path.patch
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/0002-python-don-t-install-build-paths-with-the-wheel.patch
 rename meta/recipes-kernel/systemtap/{systemtap_5.5.bb => systemtap_5.6.bb} (94%)
meta/recipes-kernel/systemtap/systemtap-native_5.6.bb renamed from meta/recipes-kernel/systemtap/systemtap-native_5.5.bb +0 -0
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap-native_5.5.bb
rename to meta/recipes-kernel/systemtap/systemtap-native_5.6.bb
meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch +1 -1
index 8a6cc4e0a4..392950631e 100644
@@ -1,4 +1,4 @@
-From adf505ededdd25cf43111fd12a59090a8f7de856 Mon Sep 17 00:00:00 2001
+From cba033a67d6d977cb5fa3862c4d3daa2eede08ba Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 22 Feb 2017 13:37:33 +0200
 Subject: [PATCH] Do not let configure write a python location into the dtrace
meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +1 -1
index 894cd3b407..970079ebcf 100644
@@ -1,4 +1,4 @@
-From 06522edad080caa76f5abc8586fe5baf3b620f16 Mon Sep 17 00:00:00 2001
+From e39dbf74b501632bc3e9761eb95894dc1c6b2d86 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Wed, 18 Jul 2018 16:58:33 +0800
 Subject: [PATCH] improve reproducibility for c++ compiling
meta/recipes-kernel/systemtap/systemtap/0001-python3.stpm-record-the-installed-libpython-path.patch new file +58 -0

58 lines not on this page · raw message

meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch +1 -1
index 59c0e8a7fd..e58053c864 100644
@@ -1,4 +1,4 @@
-From 7672d0e398b29a52f59a1a0cbb75d4d07bd5f975 Mon Sep 17 00:00:00 2001
+From 949a5670611b67f070c58423c9f88b8837aaf443 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 25 Oct 2021 17:59:24 +0200
 Subject: [PATCH] staprun: address ncurses 6.3 failures
meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch +3 -3
index 8273e34b57..7bf723d5d3 100644
@@ -1,4 +1,4 @@
-From 3483d0bc400eb618add607097027eafb075722f4 Mon Sep 17 00:00:00 2001
+From f0150581619d331522a7f26fb24b445c4f305fa0 Mon Sep 17 00:00:00 2001
 From: Saul Wold <[email protected]>
 Date: Tue, 5 Sep 2017 16:02:55 -0700
 Subject: [PATCH] staprun/stapbpf: don't support installing a non-root
@@ -14,10 +14,10 @@ Signed-off-by: Saul Wold <[email protected]>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am
-index 4bd116bc3..e06d0801b 100644
+index 962b2dbec..ac24b7997 100644
 --- a/stapbpf/Makefile.am
 +++ b/stapbpf/Makefile.am
-@@ -40,10 +40,10 @@ git_version.stamp ../git_version.h:
+@@ -56,10 +56,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.
meta/recipes-kernel/systemtap/systemtap/0002-python-don-t-install-build-paths-with-the-wheel.patch new file +61 -0

61 lines not on this page · raw message

meta/recipes-kernel/systemtap/systemtap/readline.patch +3 -3
index f452188179..f59f5bcb7f 100644
@@ -1,4 +1,4 @@
-From ee20cb1c1ca0337c56087934efbd66ba30d2d5c3 Mon Sep 17 00:00:00 2001
+From 6bd6439042b9fc1155568e8a476257925424b7cb Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 13 Apr 2026 11:28:39 +0100
 Subject: [PATCH] configure: add option to enable/disable readline
@@ -18,10 +18,10 @@ Signed-off-by: Ross Burton <[email protected]>
  1 file changed, 38 insertions(+), 29 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6fb99da40..2ec72e85a 100644
+index 5bfc86f92..c1835ea51 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -525,38 +525,47 @@ AC_CHECK_HEADERS([rpm/rpmcrypto.h], [
+@@ -526,38 +526,47 @@ AC_CHECK_HEADERS([rpm/rpmcrypto.h], [
                        have_rpmcrypto_h=yes
  		      AC_MSG_NOTICE([separate rpm/rpmcrypto.h])])
  
meta/recipes-kernel/systemtap/systemtap_5.6.bb renamed from meta/recipes-kernel/systemtap/systemtap_5.5.bb +4 -2
similarity index 94%
rename from meta/recipes-kernel/systemtap/systemtap_5.5.bb
rename to meta/recipes-kernel/systemtap/systemtap_5.6.bb
index 980c09d049..f0b14ef90a 100644
@@ -9,6 +9,8 @@ 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-python3.stpm-record-the-installed-libpython-path.patch \
+           file://0002-python-don-t-install-build-paths-with-the-wheel.patch \
            "
 
 DEPENDS = "elfutils"
@@ -16,7 +18,7 @@ DEPENDS = "elfutils"
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi --without-dyninst \
             --disable-server --disable-grapher --enable-prologues \
-            --with-python3 --without-python2-probes \
+            --with-python3 \
             --with-extra-version="oe" \
             ac_cv_prog_have_javac=no \
             ac_cv_prog_have_jar=no "
@@ -30,7 +32,7 @@ PACKAGECONFIG[translator] = "--enable-translator,--disable-translator,boost,bash
 PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt"
 PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3"
 PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c"
-PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native"
+PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native python3-pip-native python3-wheel-native"
 PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod"
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 
meta/recipes-kernel/systemtap/systemtap_git.inc +1 -2
index 7845905d10..9a12050e00 100644
@@ -3,12 +3,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;tag=release-${PV} \
            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://readline.patch \
            "
 
-SRCREV = "90b164cf106ef16f873ab58c8c6f653718bb6e17"
+SRCREV = "211e84349504077f0c84f759601b02f946465d29"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'
#4 lore raw

Patchtest results for [PATCH v2] systemtap: Upgrade 5.5 -> 5.6

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/v2-systemtap-Upgrade-5.5---5.6.patch

FAIL: test commit message user tags: Mbox includes one or more GitHub-style username tags. Ensure that any "@" symbols are stripped out of usernames (test_mbox.TestMbox.test_commit_message_user_tags)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test auh changelog truncation notice (test_mbox.TestMbox.test_auh_changelog_truncation_notice)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!