python3-hypothesis: upgrade 6.169.0 -> 6.170.8
PATCH 1/6 python3-hypothesis: upgrade 6.169.0 -> 6.170.8
ChangeLog: https://hypothesis.readthedocs.io/en/latest/changelog.html#v6-170-8
CompareLog: https://github.com/HypothesisWorks/hypothesis/compare/v6.169.0...v6.170.8
Tested by running the python3-hypothesis ptest under qemux86-64; all tests passed.
ptest results:
PASS: examples/test_binary_search.py:test_insert_is_sorted
PASS: examples/test_binary_search.py:test_is_minimal
PASS: examples/test_binary_search.py:test_inserts_into_same_place_twice
PASS: examples/test_rle.py:test_decodes_to_starting_sequence
PASS: examples/test_rle.py:test_duplicating_an_element_does_not_increase_length
============================================================================
Testsuite summary
TOTAL: 5
PASS: 5
SKIP: 0
XFAIL: 0
FAIL: 0
XPASS: 0
ERROR: 0
---
.../python/python3-hypothesis-crates.inc | 22 ++++++++++---------
...169.0.bb => python3-hypothesis_6.170.8.bb} | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
rename meta/recipes-devtools/python/{python3-hypothesis_6.169.0.bb => python3-hypothesis_6.170.8.bb} (91%)meta/recipes-devtools/python/python3-hypothesis-crates.inc +12 -10
@@ -12,17 +12,18 @@ SRC_URI += " \ crate://crates.io/portable-atomic/1.13.1 \ crate://crates.io/ppv-lite86/0.2.21 \ crate://crates.io/proc-macro2/1.0.106 \ - crate://crates.io/pyo3/0.29.3 \ - crate://crates.io/pyo3-build-config/0.29.3 \ - crate://crates.io/pyo3-ffi/0.29.3 \ - crate://crates.io/pyo3-macros/0.29.3 \ - crate://crates.io/pyo3-macros-backend/0.29.3 \ + crate://crates.io/pyo3/0.30.1 \ + crate://crates.io/pyo3-build-config/0.30.1 \ + crate://crates.io/pyo3-ffi/0.30.1 \ + crate://crates.io/pyo3-macros/0.30.1 \ + crate://crates.io/pyo3-macros-backend/0.30.1 \ crate://crates.io/quote/1.0.46 \ crate://crates.io/r-efi/5.3.0 \ crate://crates.io/rand/0.9.4 \ crate://crates.io/rand_chacha/0.9.0 \ crate://crates.io/rand_core/0.9.5 \ crate://crates.io/syn/2.0.118 \ + crate://crates.io/syn/3.0.9 \ crate://crates.io/target-lexicon/0.13.5 \ crate://crates.io/unicode-ident/1.0.24 \ crate://crates.io/wasip2/1.0.4+wasi-0.2.12 \
@@ -41,17 +42,18 @@ SRC_URI[once_cell-1.21.4.sha256sum] = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d0 SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" -SRC_URI[pyo3-0.29.3.sha256sum] = "700d18fa267b73b9b521fd7e13580e2f446916f176cacee1ab63fcc8191f1655" -SRC_URI[pyo3-build-config-0.29.3.sha256sum] = "7b3fc0c4d08f6bb10e71fe39dfb9e2f59c6eb6854e22ec8092f50c69a4499adb" -SRC_URI[pyo3-ffi-0.29.3.sha256sum] = "dfc0b8e19df29aad7086cf977bb0c2a2f143e30567eb113e9cf72b62ca698330" -SRC_URI[pyo3-macros-0.29.3.sha256sum] = "6100e8a4b5eba53afaa5ed078364851a0b2499c553a44c31026b929049b49dc6" -SRC_URI[pyo3-macros-backend-0.29.3.sha256sum] = "6143877a16e82b5a727b7127ff4cd86858a24a28d745d72f43e6f227c7b1bdb3" +SRC_URI[pyo3-0.30.1.sha256sum] = "229ca13b8a15bb0d1487b81ab975bfcd97513416499a8312011b6036e42e0de4" +SRC_URI[pyo3-build-config-0.30.1.sha256sum] = "70130e2b6dd1ee589a8788026a429561ca5c40fa7a2fa7914c2282eddae24700" +SRC_URI[pyo3-ffi-0.30.1.sha256sum] = "5e7ff73c555c286d212d4ce7e5fbda845a973c4f61bd5f160f5f2c3c2a04d1c4" +SRC_URI[pyo3-macros-0.30.1.sha256sum] = "c46d2e5862c7bb8207e3b639f713dda3c499933444784154c11d013c5a691b60" +SRC_URI[pyo3-macros-backend-0.30.1.sha256sum] = "38b89f066f2ae72a2aef52d1537ca2fcd104440ebfadee06e97aa90738a25b9b" SRC_URI[quote-1.0.46.sha256sum] = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" SRC_URI[rand-0.9.4.sha256sum] = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" SRC_URI[syn-2.0.118.sha256sum] = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +SRC_URI[syn-3.0.9.sha256sum] = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" SRC_URI[target-lexicon-0.13.5.sha256sum] = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" SRC_URI[unicode-ident-1.0.24.sha256sum] = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" SRC_URI[wasip2-1.0.4+wasi-0.2.12.sha256sum] = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
meta/recipes-devtools/python/python3-hypothesis_6.170.8.bb renamed from meta/recipes-devtools/python/python3-hypothesis_6.169.0.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "b65749d7f7a2fddfb106bb57c9902db4ab25ce8724c821f4af50cc58891a6b7b" +SRC_URI[sha256sum] = "dfc56ceac35d825fb6a85fa3ac36a598fee3101d264a39895a62f78c1cc95521" RDEPENDS:${PN} += " \ python3-attrs \
PATCH 2/6 usbutils: upgrade 019 -> 020
NEWS: https://github.com/gregkh/usbutils/blob/v020/NEWS
---
meta/recipes-bsp/usbutils/{usbutils_019.bb => usbutils_020.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-bsp/usbutils/{usbutils_019.bb => usbutils_020.bb} (94%)meta/recipes-bsp/usbutils/usbutils_020.bb renamed from meta/recipes-bsp/usbutils/usbutils_019.bb +1 -1
@@ -15,7 +15,7 @@ DEPENDS = "libusb1 virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "347c52b65a6aeb22cfe3af8382192004f99725850e1dc5f705336e54cf6d59fc" +SRC_URI[sha256sum] = "fed292b2a3dce83464ce9e96e7eaf301f58b3bf0104872b6a75edac14c907ff2" inherit meson pkgconfig update-alternatives
PATCH 3/6 python3-pycparser: upgrade 3.11 -> 3.12
In reply to Jaipaul CheernamReleaseNotes: https://github.com/eliben/pycparser/releases/tag/release_v3.12
---
.../{python3-pycparser_3.11.bb => python3-pycparser_3.12.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-pycparser_3.11.bb => python3-pycparser_3.12.bb} (83%)meta/recipes-devtools/python/python3-pycparser_3.12.bb renamed from meta/recipes-devtools/python/python3-pycparser_3.11.bb +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eliben/pycparser" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c453675224ee9a35b46135214d26c055" -SRC_URI[sha256sum] = "d875f09c3507d00e1aba0eecc6dcadc1352f30fff09dc6bff2f1c2935e97c2bc" +SRC_URI[sha256sum] = "f03387877eab82ce01bbdfd0ba7252ee55a90b1c708d5129e2ce915475cf1db6" inherit pypi python_setuptools_build_meta
PATCH 4/6 harfbuzz: upgrade 14.6.0 -> 15.0.0
In reply to Jaipaul CheernamOverview of changes leading to 15.0.0
Thursday, October 22, 2026
=====================================
- Support for the new tables and formats in the ISO Open Font Format (OFF) 5th edition is now enabled by default:
- Deprecated API:
-hb_font_set_face()
---
.../harfbuzz/{harfbuzz_14.6.0.bb => harfbuzz_15.0.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_14.6.0.bb => harfbuzz_15.0.0.bb} (96%)meta/recipes-graphics/harfbuzz/harfbuzz_15.0.0.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_14.6.0.bb +1 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ " SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d07a007327277708a2a73ae437887cdbaf282937f6d03ca5467723e9099af586" +SRC_URI[sha256sum] = "968536e9abd782f07f7954044c0c4020199fcdd39b41d221ec42d2a3be4a44df" inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases
PATCH 5/6 strace: upgrade 7.2 -> 7.3
In reply to Jaipaul CheernamNEWS: https://github.com/strace/strace/blob/v7.3/NEWS
- Fix indentation for SRC_URI
- Refresh existing patches
- Add 0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch for ptest fix PR is still open https://github.com/strace/strace/pull/429
============================================================================
Testsuite summary for strace 7.3
============================================================================
TOTAL: 1525
PASS: 1172
SKIP: 352
XFAIL: 0
FAIL: 1
XPASS: 0
ERROR: 0
============================================================================
---
...f-link-and-bpf_link-anon_inode-names.patch | 135 ++++++++++++++++++
...toconf-macro-to-detect-largefile-sup.patch | 4 +-
...kport-ax_prog_cc_for_build.m4-macros.patch | 2 +-
...001-strace-fix-reproducibilty-issues.patch | 12 +-
...002-tests-Replace-off64_t-with-off_t.patch | 2 +-
.../strace/strace/Makefile-ptest.patch | 6 +-
.../strace/strace/ptest-spacesave.patch | 6 +-
.../strace/strace/skip-load.patch | 2 +-
.../strace/strace/update-gawk-paths.patch | 2 +-
.../strace/{strace_7.2.bb => strace_7.3.bb} | 5 +-
10 files changed, 156 insertions(+), 20 deletions(-)
create mode 100644 meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch
rename meta/recipes-devtools/strace/{strace_7.2.bb => strace_7.3.bb} (92%)meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +135 -0
@@ -0,0 +1,135 @@ +From fa20cc5e8c736ec606efaa18427f0fd49cc45d12 Mon Sep 17 00:00:00 2001 +From: Zkingom <[email protected]> +Date: Thu, 22 Oct 2026 19:20:15 +0800 +Subject: [PATCH] Handle both "bpf-link" and "bpf_link" anon_inode names for + BPF links + +The kernel uses two different anon_inode name strings for BPF link file +descriptors due to an inconsistency introduced across two commits: + +- commit 70ed506c3bbc ("bpf: Introduce pinnable bpf_link abstraction") + introduced bpf_link_new_fd() with anon_inode_getfd("bpf-link", ...), + matching the naming convention used by other BPF objects ("bpf-map", + "bpf-prog", "bpf-stats"). +- commit babf3164095b ("bpf: Add bpf_link_new_file that doesn't install + FD") added bpf_link_new_file(), later renamed to bpf_link_prime(), + with anon_inode_getfile("bpf_link", ...), using an underscore instead + of a hyphen. + +As a result, BPF link file descriptors appear as anon_inode:bpf-link +when obtained via BPF_LINK_GET_FD_BY_ID or BPF_OBJ_GET from bpffs, and +as anon_inode:bpf_link when returned by BPF_LINK_CREATE. + +Recognize both names to correctly identify BPF link descriptors +regardless of how they were obtained. + +* src/bpf.c (print_bpf_obj_info): Recognize anon_inode:bpf_link. +* tests/bpf-obj_get_info_by_fd-link.c (main): Obtain the link fd +path dynamically and skip when procfs is unavailable. +* tests/gen_tests.in (bpf-obj_get_info_by_fd-link): Filter out +setup calls preceding the information query. +* NEWS: Mention the fix. + +Signed-off-by: Xu Zhou <[email protected]> +Signed-off-by: Zkingom <[email protected]> +Assisted-by: Codex:GPT-6.1-Sol + +Upstream-Status: Submitted [https://github.com/strace/strace/pull/429] + +Signed-off-by: Jaipaul Cheernam <[email protected]> +--- + NEWS | 8 ++++++++ + src/bpf.c | 3 ++- + tests/bpf-obj_get_info_by_fd-link.c | 11 ++++++++--- + tests/gen_tests.in | 2 +- + 4 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/NEWS b/NEWS +index eb5465a66c..da93026b4f 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,11 @@ ++Noteworthy changes in release ?.? (????-??-??) ++============================================== ++ ++* Bug fixes ++ ++ * Fixed decoding of BPF_OBJ_GET_INFO_BY_FD for BPF links created by ++ BPF_LINK_CREATE. ++ + Noteworthy changes in release 7.3 (2026-10-22) + ============================================== + +diff --git a/src/bpf.c b/src/bpf.c +index 3b09f45955..1498d5c0f2 100644 +--- a/src/bpf.c ++++ b/src/bpf.c +@@ -1662,7 +1662,8 @@ print_bpf_obj_info(struct tcb * const tcp, uint32_t bpf_fd, uint64_t info, + } obj_printers[] = { + { "anon_inode:bpf-map", print_bpf_map_info }, + { "anon_inode:bpf-prog", print_bpf_prog_info }, +- { "anon_inode:bpf-link", print_bpf_link_info } ++ { "anon_inode:bpf-link", print_bpf_link_info }, ++ { "anon_inode:bpf_link", print_bpf_link_info } + }; + + if (entering(tcp)) { +diff --git a/tests/bpf-obj_get_info_by_fd-link.c b/tests/bpf-obj_get_info_by_fd-link.c +index 9536f0222f..c5f60ffc95 100644 +--- a/tests/bpf-obj_get_info_by_fd-link.c ++++ b/tests/bpf-obj_get_info_by_fd-link.c +@@ -14,6 +14,7 @@ + #include <stddef.h> + #include <stdio.h> + #include <stdint.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + +@@ -43,6 +44,8 @@ sys_bpf(kernel_ulong_t cmd, void *attr, kernel_ulong_t size) + int + main(void) + { ++ skip_if_unavailable("/proc/self/fd/"); ++ + static const struct bpf_insn cgroup_prog[] = { + { /* r0 = 1 (allow) */ + .code = BPF_ALU64 | BPF_K | BPF_MOV, +@@ -97,10 +100,11 @@ main(void) + if (ret < 0) + perror_msg_and_skip("BPF_OBJ_GET_INFO_BY_FD"); + ++ char *link_fd_path = get_fd_path(link_fd); + printf("bpf(BPF_OBJ_GET_INFO_BY_FD" +- ", {info={bpf_fd=%d<anon_inode:bpf-link>" ++ ", {info={bpf_fd=%d<%s>" + ", info_len=%zu", +- link_fd, LINK_INFO_SZ); ++ link_fd, link_fd_path, LINK_INFO_SZ); + if (get_info_attr.info_len != LINK_INFO_SZ) + printf(" => %u", get_info_attr.info_len); + printf(", info={type="); +@@ -110,8 +114,9 @@ main(void) + printf(", cgroup={cgroup_id=%" PRIu64, link_info->cgroup.cgroup_id); + printf(", attach_type="); + printxval(bpf_attach_type, link_info->cgroup.attach_type, "BPF_???"); +- printf("}}}, %zu) = %s\n", sizeof(get_info_attr), errstr); ++ printf("}}}}, %zu) = %s\n", sizeof(get_info_attr), errstr); + ++ free(link_fd_path); + puts("+++ exited with 0 +++"); + return 0; + } +diff --git a/tests/gen_tests.in b/tests/gen_tests.in +index 71393c72a6..6bf0e91db9 100644 +--- a/tests/gen_tests.in ++++ b/tests/gen_tests.in +@@ -31,7 +31,7 @@ arch_prctl-success-Xverbose +prctl-success.sh ARCH_PRCTL_INJECT_RETVALS="0 1 2 3 + at_fdcwd-pathmax -a36 --trace=openat -y -P sample + bpf -a20 + bpf-obj_get_info_by_fd -a20 -y -e trace=bpf +-bpf-obj_get_info_by_fd-link -a20 -y -v -e trace=bpf ++bpf-obj_get_info_by_fd-link -a20 -y -v -e trace=bpf "QUIRK:START-OF-TEST-OUTPUT:bpf(BPF_OBJ_GET_INFO_BY_FD" + bpf-obj_get_info_by_fd-prog -a20 -y -e trace=bpf + bpf-obj_get_info_by_fd-prog-v -a20 -y -v -e trace=bpf + bpf-obj_get_info_by_fd-v -a20 -y -v -e trace=bpf
meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +2 -2
@@ -1,4 +1,4 @@ -From 334b66af1329bc6970c9ff9ee668af6cc2133b8f Mon Sep 17 00:00:00 2001 +From dff502ff4ae95a310ea10eeda0aaf5626de3890b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:54:27 -0800 Subject: [PATCH] configure: Use autoconf macro to detect largefile support
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 956bb85..0812725 100644 +index 9bec14b..57406f5 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,8 @@ AC_PROG_INSTALL
meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch +1 -1
@@ -1,4 +1,4 @@ -From b402cfcdfb782ab3a8b264b23536a4de5f709746 Mon Sep 17 00:00:00 2001 +From de4d51c010e12a8c843dd3e241e392cd8cbcc6ca Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 10 Apr 2026 23:39:47 +0000 Subject: [PATCH] m4: Backport ax_prog_cc_for_build.m4 macros
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +6 -6
@@ -1,4 +1,4 @@ -From 5905b406c5325442f2001339937ad22b2d068b15 Mon Sep 17 00:00:00 2001 +From a99f2283ed13b03185b67ddda507aed3aa0f595e Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 11 Mar 2020 19:56:55 +0000 Subject: [PATCH] strace: fix reproducibilty issues
@@ -13,19 +13,19 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 3c6228a..43b94ea 100755 +index d71e1c1..c191673 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -46,7 +46,7 @@ while read -r name arg0 args; do { +@@ -52,7 +52,7 @@ while read -r name arg0 args; do { hdr="\ #!/bin/sh -efu -# Generated by $0 from $input ($name $arg0 $args); do not edit." +# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." - case "$arg0" in - +*) -@@ -102,7 +102,7 @@ while read -r name arg0 args; do { + # A generated test may be sourced while another build regenerates it. + # Replace the file atomically so the reader keeps its original contents. +@@ -112,7 +112,7 @@ while read -r name arg0 args; do { if [ -n "$names" ]; then {
meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +1 -1
@@ -1,4 +1,4 @@ -From bcca8619f749ba78a4ce78d39c603e2606175175 Mon Sep 17 00:00:00 2001 +From 85eb02371ea47e79f912fa03dbe03c849c093b36 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:56:13 -0800 Subject: [PATCH] tests: Replace off64_t with off_t
meta/recipes-devtools/strace/strace/Makefile-ptest.patch +3 -3
@@ -1,4 +1,4 @@ -From 2749699b77b4fcce7e6e960f246259b05f3dafcc Mon Sep 17 00:00:00 2001 +From f7ad423f864c5f882c7e220f564a21e9421ac73b Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <[email protected]> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 84a9638..23fd218 100644 +index 12b63b2..1ddf782 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -24,7 +24,7 @@ index 84a9638..23fd218 100644 AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -968,3 +969,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) +@@ -982,3 +983,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) CLEANFILES = ksysent.h include ../src/scno.am
meta/recipes-devtools/strace/strace/ptest-spacesave.patch +3 -3
@@ -1,4 +1,4 @@ -From ae538d4dcb0ea7265d72671b7dd3537ca1356437 Mon Sep 17 00:00:00 2001 +From 0bcea4d97bdbfba5920ceb56215a911c9d529dc6 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 29 May 2019 00:10:32 +0100 Subject: [PATCH] strace: Tweak ptest disk space management
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [specific to OE image space issues] 1 file changed, 1 insertion(+) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index f22ad08..3c6228a 100755 +index 2a7fada..d71e1c1 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -84,6 +84,7 @@ while read -r name arg0 args; do { +@@ -93,6 +93,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" run_strace_match_diff $arg0 $args
meta/recipes-devtools/strace/strace/skip-load.patch +1 -1
@@ -1,4 +1,4 @@ -From 2653515537b66a4b1286be107e9ef406c55040b4 Mon Sep 17 00:00:00 2001 +From 5c9048988e5000fb0f175afde05a23be2ef0fa15 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Sat, 30 Aug 2025 00:47:03 +0200 Subject: [PATCH] strace: skip a number of load-sensitive tests
meta/recipes-devtools/strace/strace/update-gawk-paths.patch +1 -1
@@ -1,4 +1,4 @@ -From be1b3d74ca4ffb3c8d3e38fdb96f23d5920f8ef1 Mon Sep 17 00:00:00 2001 +From 3c4da31783f127d18cf1b64ca33ac46a512da2cb Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk
meta/recipes-devtools/strace/strace_7.3.bb renamed from meta/recipes-devtools/strace/strace_7.2.bb +3 -2
@@ -14,12 +14,13 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch \ + file://0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch \ + file://0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch \ " SRC_URI:append:libc-musl = "\ file://0001-Ignore-pwritev-pwrite64-tests-on-musl.patch \ " -SRC_URI[sha256sum] = "4bde6246926890dcee824f6e6ac42a06752f47d77e5097d86e3c0d6d4b709fe5" +SRC_URI[sha256sum] = "529634c40910895a9a1f3c5c1e65da2ca9ed72fb158dfc4bcc89efdf05e39b72" inherit autotools github-releases ptest
Re: [OE-core] [PATCH 5/6] strace: upgrade 7.2 -> 7.3
Quoted 379 lines · Jaipaul Cheernam via lists.openembedded.org
NEWS: https://github.com/strace/strace/blob/v7.3/NEWS
- Fix indentation for
SRC_URI
- Refresh existing patches
- Add 0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch for ptest fix
PR is still open https://github.com/strace/strace/pull/429============================================================================
Testsuite summary for strace 7.3============================================================================
TOTAL: 1525
PASS: 1172
SKIP: 352
XFAIL: 0
FAIL: 1
XPASS: 0
ERROR: 0============================================================================
Signed-off-by Jaipaul Cheernam <[email protected]>--- ...f-link-and-bpf_link-anon_inode-names.patch | 135 ++++++++++++++++++ ...toconf-macro-to-detect-largefile-sup.patch | 4 +- ...kport-ax_prog_cc_for_build.m4-macros.patch | 2 +- ...001-strace-fix-reproducibilty-issues.patch | 12 +- ...002-tests-Replace-off64_t-with-off_t.patch | 2 +- .../strace/strace/Makefile-ptest.patch | 6 +- .../strace/strace/ptest-spacesave.patch | 6 +- .../strace/strace/skip-load.patch | 2 +- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_7.2.bb => strace_7.3.bb} | 5 +- 10 files changed, 156 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch rename meta/recipes-devtools/strace/{strace_7.2.bb => strace_7.3.bb}(92%)
diff --git
a/meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patchb/meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patchnew file mode 100644
index 00000000000..4e5235b9683
---/dev/null
+++b/meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patchmeta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +4
-0@@ -0,0 +1,135 @@ +From fa20cc5e8c736ec606efaa18427f0fd49cc45d12 Mon Sep 17 00:00:00 2001 +From: Zkingom <[email protected]> +Date: Thu, 22 Oct 2026 19:20:15 +0800 +Subject: [PATCH] Handle both "bpf-link" and "bpf_link" anon_inode namesfor
+ BPF linksmeta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +62
-0+ +The kernel uses two different anon_inode name strings for BPF link file +descriptors due to an inconsistency introduced across two commits: + +- commit 70ed506c3bbc ("bpf: Introduce pinnable bpf_link abstraction") + introduced bpf_link_new_fd() with anon_inode_getfd("bpf-link", ...), + matching the naming convention used by other BPF objects ("bpf-map", + "bpf-prog", "bpf-stats"). +- commit babf3164095b ("bpf: Add bpf_link_new_file that doesn't install + FD") added bpf_link_new_file(), later renamed to bpf_link_prime(), + with anon_inode_getfile("bpf_link", ...), using an underscore instead + of a hyphen. + +As a result, BPF link file descriptors appear as anon_inode:bpf-link +when obtained via BPF_LINK_GET_FD_BY_ID or BPF_OBJ_GET from bpffs, and +as anon_inode:bpf_link when returned by BPF_LINK_CREATE. + +Recognize both names to correctly identify BPF link descriptors +regardless of how they were obtained. + +* src/bpf.c (print_bpf_obj_info): Recognize anon_inode:bpf_link. +* tests/bpf-obj_get_info_by_fd-link.c (main): Obtain the link fd +path dynamically and skip when procfs is unavailable. +* tests/gen_tests.in (bpf-obj_get_info_by_fd-link): Filter out +setup calls preceding the information query. +* NEWS: Mention the fix. + +Signed-off-by: Xu Zhou <[email protected]> +Signed-off-by: Zkingom <[email protected]> +Assisted-by: Codex:GPT-6.1-Sol + +Upstream-Status: Submitted [https://github.com/strace/strace/pull/429] + +Signed-off-by: Jaipaul Cheernam <[email protected]> +--- + NEWS | 8 ++++++++ + src/bpf.c | 3 ++- + tests/bpf-obj_get_info_by_fd-link.c | 11 ++++++++--- + tests/gen_tests.in | 2 +- + 4 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/NEWS b/NEWS +index eb5465a66c..da93026b4f 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,11 @@ ++Noteworthy changes in release ?.? (????-??-??) ++============================================== ++ ++* Bug fixes ++ ++ * Fixed decoding of BPF_OBJ_GET_INFO_BY_FD for BPF links created by ++ BPF_LINK_CREATE. ++ + Noteworthy changes in release 7.3 (2026-10-22) + ============================================== + +diff --git a/src/bpf.c b/src/bpf.c +index 3b09f45955..1498d5c0f2 100644 +--- a/src/bpf.c ++++ b/src/bpf.c +@@ -1662,7 +1662,8 @@ print_bpf_obj_info(struct tcb * const tcp, uint32_t
bpf_fd,uint64_tinfo,meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +10
-0+ } obj_printers[] = { + { "anon_inode:bpf-map", print_bpf_map_info }, + { "anon_inode:bpf-prog", print_bpf_prog_info }, +- { "anon_inode:bpf-link", print_bpf_link_info } ++ { "anon_inode:bpf-link", print_bpf_link_info }, ++ { "anon_inode:bpf_link", print_bpf_link_info } + }; + + if (entering(tcp)) { +diff --git a/tests/bpf-obj_get_info_by_fd-link.c
b/tests/bpf-obj_get_info_by_fd-link.cmeta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +12
-0+index 9536f0222f..c5f60ffc95 100644 +--- a/tests/bpf-obj_get_info_by_fd-link.c ++++ b/tests/bpf-obj_get_info_by_fd-link.c +@@ -14,6 +14,7 @@ + #include <stddef.h> + #include <stdio.h> + #include <stdint.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + +@@ -43,6 +44,8 @@ sys_bpf(kernel_ulong_t cmd, void *attr, kernel_ulong_tsize)
+ int
+ main(void)
+ {
++skip_if_unavailable("/proc/self/fd/");
++meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +19
-0+ static const struct bpf_insn cgroup_prog[] = { + { /* r0 = 1 (allow) */ + .code = BPF_ALU64 | BPF_K | BPF_MOV, +@@ -97,10 +100,11 @@ main(void) + if (ret < 0) + perror_msg_and_skip("BPF_OBJ_GET_INFO_BY_FD"); + ++ char *link_fd_path = get_fd_path(link_fd); + printf("bpf(BPF_OBJ_GET_INFO_BY_FD" +- ", {info={bpf_fd=%d<anon_inode:bpf-link>" ++ ", {info={bpf_fd=%d<%s>" + ", info_len=%zu", +- link_fd, LINK_INFO_SZ); ++ link_fd, link_fd_path, LINK_INFO_SZ); + if (get_info_attr.info_len != LINK_INFO_SZ) + printf(" => %u", get_info_attr.info_len); + printf(", info={type="); +@@ -110,8 +114,9 @@ main(void) + printf(", cgroup={cgroup_id=%" PRIu64,
link_info->cgroup.cgroup_id);(quoted diff) +2
-0+ printf(", attach_type="); + printxval(bpf_attach_type, link_info->cgroup.attach_type,"
BPF_???");+- printf("}}}, %zu) = %s\n", sizeof(get_info_attr), errstr); ++ printf("}}}}, %zu) = %s\n", sizeof(get_info_attr), errstr);meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +10
-0+ ++ free(link_fd_path); + puts("+++ exited with 0 +++"); + return 0; + } +diff --git a/tests/gen_tests.in b/tests/gen_tests.in +index 71393c72a6..6bf0e91db9 100644 +--- a/tests/gen_tests.in ++++ b/tests/gen_tests.in +@@ -31,7 +31,7 @@ arch_prctl-success-Xverbose +prctl-success.shARCH_PRCTL_INJECT_RETVALS="0 1 2 3
+ at_fdcwd-pathmax -a36 --trace=openat -y -P sample
+ bpf -a20+ bpf-obj_get_info_by_fd -a20 -y -e trace=bpf +-bpf-obj_get_info_by_fd-link -a20 -y -v -e trace=bpf ++bpf-obj_get_info_by_fd-link -a20 -y -v -e trace=bpf"QUIRK:START-OF-TEST-OUTPUT:bpf(BPF_OBJ_GET_INFO_BY_FD"
+ bpf-obj_get_info_by_fd-prog -a20 -y -e trace=bpf
+ bpf-obj_get_info_by_fd-prog-v -a20 -y -v -e trace=bpf
+ bpf-obj_get_info_by_fd-v -a20 -y -v -e trace=bpf
diff --gita/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patchb/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patchindex25f32d17348..ebcd316e9fb100644
---a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
+++b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patchmeta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +2
-2@@ -1,4 +1,4 @@ -From 334b66af1329bc6970c9ff9ee668af6cc2133b8f Mon Sep 17 00:00:00 2001 +From dff502ff4ae95a310ea10eeda0aaf5626de3890b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:54:27 -0800 Subject: [PATCH] configure: Use autoconf macro to detect largefile support@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 956bb85..0812725 100644 +index 9bec14b..57406f5 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,8 @@ AC_PROG_INSTALLdiff --git
a/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patchb/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patchindex60e51411973..478bb7b9d9b100644
---a/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
+++b/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patchmeta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch +1
-1@@ -1,4 +1,4 @@ -From b402cfcdfb782ab3a8b264b23536a4de5f709746 Mon Sep 17 00:00:00 2001 +From de4d51c010e12a8c843dd3e241e392cd8cbcc6ca Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 10 Apr 2026 23:39:47 +0000 Subject: [PATCH] m4: Backport ax_prog_cc_for_build.m4 macrosdiff --git
a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patchb/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patchindex4907b16a1c7..8a8b18d698e100644
---a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
+++b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patchmeta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +3
-3@@ -1,4 +1,4 @@ -From 5905b406c5325442f2001339937ad22b2d068b15 Mon Sep 17 00:00:00 2001 +From a99f2283ed13b03185b67ddda507aed3aa0f595e Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 11 Mar 2020 19:56:55 +0000 Subject: [PATCH] strace: fix reproducibilty issues@@ -13,19 +13,19 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 3c6228a..43b94ea 100755 +index d71e1c1..c191673 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -46,7 +46,7 @@ while read -r name arg0 args; do { +@@ -52,7 +52,7 @@ while read -r name arg0 args; do { hdr="\ #!/bin/sh -efu -# Generated by $0 from $input ($name $arg0 $args); do not edit." +# Generated by $(basename $0) from $input ($name $arg0 $args); do notedit."
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +1
-3- case "$arg0" in - +*) -@@ -102,7 +102,7 @@ while read -r name arg0 args; do { + # A generated test may be sourced while another build regeneratesit.
+ # Replace the file atomically so the reader keeps its original
contents.
+@@ -112,7 +112,7 @@ while read -r name arg0 args; do {if [ -n "$names" ]; then
{diff --git
a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patchb/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patchindexe7842688550..88a81519bf9100644
---a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
+++b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch(quoted diff) +0
-1@@ -1,4 +1,4 @@ -From bcca8619f749ba78a4ce78d39c603e2606175175 <(260)%20617-5175> Mon Sep17 00:00:00 2001
meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +1
-0+From 85eb02371ea47e79f912fa03dbe03c849c093b36 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:56:13 -0800 Subject: [PATCH] tests: Replace off64_t with off_tmeta/recipes-devtools/strace/strace/Makefile-ptest.patch +3
-3@@ -1,4 +1,4 @@ -From 2749699b77b4fcce7e6e960f246259b05f3dafcc Mon Sep 17 00:00:00 2001 +From f7ad423f864c5f882c7e220f564a21e9421ac73b Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <[email protected]> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 84a9638..23fd218 100644 +index 12b63b2..1ddf782 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@@@ -24,7 +24,7 @@ index 84a9638..23fd218 100644 AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -968,3 +969,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) +@@ -982,3 +983,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) CLEANFILES = ksysent.hinclude ../src/scno.am
meta/recipes-devtools/strace/strace/ptest-spacesave.patch +1
-1@@ -1,4 +1,4 @@ -From ae538d4dcb0ea7265d72671b7dd3537ca1356437 Mon Sep 17 00:00:00 2001 +From 0bcea4d97bdbfba5920ceb56215a911c9d529dc6 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 29 May 2019 00:10:32 +0100 Subject: [PATCH] strace: Tweak ptest disk space management@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [specific to OE imagespace issues]
1 file changed, 1 insertion(+)diff --git
a/tests/gen_tests.shb/tests/gen_tests.shmeta/recipes-devtools/strace/strace/ptest-spacesave.patch +2
-2-index f22ad08..3c6228a 100755 +index 2a7fada..d71e1c1 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -84,6 +84,7 @@ while read -r name arg0 args; do { +@@ -93,6 +93,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" run_strace_match_diff $arg0 $argsmeta/recipes-devtools/strace/strace/skip-load.patch +1
-1@@ -1,4 +1,4 @@ -From 2653515537b66a4b1286be107e9ef406c55040b4 Mon Sep 17 00:00:00 2001 +From 5c9048988e5000fb0f175afde05a23be2ef0fa15 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Sat, 30 Aug 2025 00:47:03 +0200 Subject: [PATCH] strace: skip a number of load-sensitive testsmeta/recipes-devtools/strace/strace/update-gawk-paths.patch +1
-1@@ -1,4 +1,4 @@ -From be1b3d74ca4ffb3c8d3e38fdb96f23d5920f8ef1 Mon Sep 17 00:00:00 2001 +From 3c4da31783f127d18cf1b64ca33ac46a512da2cb Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawkmeta/recipes-devtools/strace/strace_7.3.bb renamed from meta/recipes-devtools/strace/strace_7.2.bb +0
-0@@ -14,12 +14,13 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \
meta/recipes-devtools/strace/strace_7.3.bb SRC_URI = · line 26
Quoted 10 lines
meta/recipes-devtools/strace/strace_7.3.bb renamed from meta/recipes-devtools/strace/strace_7.2.bb +2
-1file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch \ + file://0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch \ + file://0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch \ " SRC_URI:append:libc-musl = "\ file://0001-Ignore-pwritev-pwrite64-tests-on-musl.patch \ "
I think above patch is no longer needed since the tests are now fixed to work on musl see
https://github.com/strace/strace/commit/2b7d533ac7aef9a9d97dddcb582d622b8c0fc0c6
Please run the tests on musl target as well to ensure its the case.
Quoted 19 lines
-SRC_URI[sha256sum] = "
4bde6246926890dcee824f6e6ac42a06752f47d77e5097d86e3c0d6d4b709fe5" +SRC_URI[sha256sum] = "529634c40910895a9a1f3c5c1e65da2ca9ed72fb158dfc4bcc89efdf05e39b72"inherit autotools github-releases ptest
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#248546):
https://lists.openembedded.org/g/openembedded-core/message/248546
Mute This Topic: https://lists.openembedded.org/mt/121898413/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH v2 1/1 strace: upgrade 7.2 -> 7.3
In reply to Jaipaul CheernamNEWS: https://github.com/strace/strace/blob/v7.3/NEWS
- Fix indentation for SRC_URI
- Refresh existing patches
- Add 0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch for ptest fix PR is still open https://github.com/strace/strace/pull/429
- Drop Ignore-pwritev-pwrite64-tests-on-musl.patch as test are running with musl
============================================================================
Testsuite summary for strace 7.3
============================================================================
TOTAL: 1525
PASS: 1172
SKIP: 352
XFAIL: 0
FAIL: 1
XPASS: 0
ERROR: 0
============================================================================
musl ptest results
============================================================================
Testsuite summary for strace 7.3
============================================================================
TOTAL: 1525
PASS: 1172
SKIP: 353
XFAIL: 0
FAIL: 0
XPASS: 0
ERROR: 0
============================================================================
---
- Changes since v1:
- Drop musl ptest ignore patch
...f-link-and-bpf_link-anon_inode-names.patch | 135 ++++++++++++++++++
...gnore-pwritev-pwrite64-tests-on-musl.patch | 62 --------
...toconf-macro-to-detect-largefile-sup.patch | 4 +-
...kport-ax_prog_cc_for_build.m4-macros.patch | 2 +-
...001-strace-fix-reproducibilty-issues.patch | 12 +-
...002-tests-Replace-off64_t-with-off_t.patch | 2 +-
.../strace/strace/Makefile-ptest.patch | 6 +-
.../strace/strace/ptest-spacesave.patch | 6 +-
.../strace/strace/skip-load.patch | 2 +-
.../strace/strace/update-gawk-paths.patch | 2 +-
.../strace/{strace_7.2.bb => strace_7.3.bb} | 8 +-
11 files changed, 156 insertions(+), 85 deletions(-)
create mode 100644 meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch
rename meta/recipes-devtools/strace/{strace_7.2.bb => strace_7.3.bb} (91%)meta/recipes-devtools/strace/strace/0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch new file +135 -0
@@ -0,0 +1,135 @@ +From fa20cc5e8c736ec606efaa18427f0fd49cc45d12 Mon Sep 17 00:00:00 2001 +From: Zkingom <[email protected]> +Date: Thu, 22 Oct 2026 19:20:15 +0800 +Subject: [PATCH] Handle both "bpf-link" and "bpf_link" anon_inode names for + BPF links + +The kernel uses two different anon_inode name strings for BPF link file +descriptors due to an inconsistency introduced across two commits: + +- commit 70ed506c3bbc ("bpf: Introduce pinnable bpf_link abstraction") + introduced bpf_link_new_fd() with anon_inode_getfd("bpf-link", ...), + matching the naming convention used by other BPF objects ("bpf-map", + "bpf-prog", "bpf-stats"). +- commit babf3164095b ("bpf: Add bpf_link_new_file that doesn't install + FD") added bpf_link_new_file(), later renamed to bpf_link_prime(), + with anon_inode_getfile("bpf_link", ...), using an underscore instead + of a hyphen. + +As a result, BPF link file descriptors appear as anon_inode:bpf-link +when obtained via BPF_LINK_GET_FD_BY_ID or BPF_OBJ_GET from bpffs, and +as anon_inode:bpf_link when returned by BPF_LINK_CREATE. + +Recognize both names to correctly identify BPF link descriptors +regardless of how they were obtained. + +* src/bpf.c (print_bpf_obj_info): Recognize anon_inode:bpf_link. +* tests/bpf-obj_get_info_by_fd-link.c (main): Obtain the link fd +path dynamically and skip when procfs is unavailable. +* tests/gen_tests.in (bpf-obj_get_info_by_fd-link): Filter out +setup calls preceding the information query. +* NEWS: Mention the fix. + +Signed-off-by: Xu Zhou <[email protected]> +Signed-off-by: Zkingom <[email protected]> +Assisted-by: Codex:GPT-6.1-Sol + +Upstream-Status: Submitted [https://github.com/strace/strace/pull/429] + +Signed-off-by: Jaipaul Cheernam <[email protected]> +--- + NEWS | 8 ++++++++ + src/bpf.c | 3 ++- + tests/bpf-obj_get_info_by_fd-link.c | 11 ++++++++--- + tests/gen_tests.in | 2 +- + 4 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/NEWS b/NEWS +index eb5465a66c..da93026b4f 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,11 @@ ++Noteworthy changes in release ?.? (????-??-??) ++============================================== ++ ++* Bug fixes ++ ++ * Fixed decoding of BPF_OBJ_GET_INFO_BY_FD for BPF links created by ++ BPF_LINK_CREATE. ++ + Noteworthy changes in release 7.3 (2026-10-22) + ============================================== + +diff --git a/src/bpf.c b/src/bpf.c +index 3b09f45955..1498d5c0f2 100644 +--- a/src/bpf.c ++++ b/src/bpf.c +@@ -1662,7 +1662,8 @@ print_bpf_obj_info(struct tcb * const tcp, uint32_t bpf_fd, uint64_t info, + } obj_printers[] = { + { "anon_inode:bpf-map", print_bpf_map_info }, + { "anon_inode:bpf-prog", print_bpf_prog_info }, +- { "anon_inode:bpf-link", print_bpf_link_info } ++ { "anon_inode:bpf-link", print_bpf_link_info }, ++ { "anon_inode:bpf_link", print_bpf_link_info } + }; + + if (entering(tcp)) { +diff --git a/tests/bpf-obj_get_info_by_fd-link.c b/tests/bpf-obj_get_info_by_fd-link.c +index 9536f0222f..c5f60ffc95 100644 +--- a/tests/bpf-obj_get_info_by_fd-link.c ++++ b/tests/bpf-obj_get_info_by_fd-link.c +@@ -14,6 +14,7 @@ + #include <stddef.h> + #include <stdio.h> + #include <stdint.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + +@@ -43,6 +44,8 @@ sys_bpf(kernel_ulong_t cmd, void *attr, kernel_ulong_t size) + int + main(void) + { ++ skip_if_unavailable("/proc/self/fd/"); ++ + static const struct bpf_insn cgroup_prog[] = { + { /* r0 = 1 (allow) */ + .code = BPF_ALU64 | BPF_K | BPF_MOV, +@@ -97,10 +100,11 @@ main(void) + if (ret < 0) + perror_msg_and_skip("BPF_OBJ_GET_INFO_BY_FD"); + ++ char *link_fd_path = get_fd_path(link_fd); + printf("bpf(BPF_OBJ_GET_INFO_BY_FD" +- ", {info={bpf_fd=%d<anon_inode:bpf-link>" ++ ", {info={bpf_fd=%d<%s>" + ", info_len=%zu", +- link_fd, LINK_INFO_SZ); ++ link_fd, link_fd_path, LINK_INFO_SZ); + if (get_info_attr.info_len != LINK_INFO_SZ) + printf(" => %u", get_info_attr.info_len); + printf(", info={type="); +@@ -110,8 +114,9 @@ main(void) + printf(", cgroup={cgroup_id=%" PRIu64, link_info->cgroup.cgroup_id); + printf(", attach_type="); + printxval(bpf_attach_type, link_info->cgroup.attach_type, "BPF_???"); +- printf("}}}, %zu) = %s\n", sizeof(get_info_attr), errstr); ++ printf("}}}}, %zu) = %s\n", sizeof(get_info_attr), errstr); + ++ free(link_fd_path); + puts("+++ exited with 0 +++"); + return 0; + } +diff --git a/tests/gen_tests.in b/tests/gen_tests.in +index 71393c72a6..6bf0e91db9 100644 +--- a/tests/gen_tests.in ++++ b/tests/gen_tests.in +@@ -31,7 +31,7 @@ arch_prctl-success-Xverbose +prctl-success.sh ARCH_PRCTL_INJECT_RETVALS="0 1 2 3 + at_fdcwd-pathmax -a36 --trace=openat -y -P sample + bpf -a20 + bpf-obj_get_info_by_fd -a20 -y -e trace=bpf +-bpf-obj_get_info_by_fd-link -a20 -y -v -e trace=bpf ++bpf-obj_get_info_by_fd-link -a20 -y -v -e trace=bpf "QUIRK:START-OF-TEST-OUTPUT:bpf(BPF_OBJ_GET_INFO_BY_FD" + bpf-obj_get_info_by_fd-prog -a20 -y -e trace=bpf + bpf-obj_get_info_by_fd-prog-v -a20 -y -v -e trace=bpf + bpf-obj_get_info_by_fd-v -a20 -y -v -e trace=bpf
meta/recipes-devtools/strace/strace/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch deleted +0 -62
62 lines not on this page · raw message
meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +2 -2
@@ -1,4 +1,4 @@ -From 334b66af1329bc6970c9ff9ee668af6cc2133b8f Mon Sep 17 00:00:00 2001 +From dff502ff4ae95a310ea10eeda0aaf5626de3890b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:54:27 -0800 Subject: [PATCH] configure: Use autoconf macro to detect largefile support
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 956bb85..0812725 100644 +index 9bec14b..57406f5 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,8 @@ AC_PROG_INSTALL
meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch +1 -1
@@ -1,4 +1,4 @@ -From b402cfcdfb782ab3a8b264b23536a4de5f709746 Mon Sep 17 00:00:00 2001 +From de4d51c010e12a8c843dd3e241e392cd8cbcc6ca Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 10 Apr 2026 23:39:47 +0000 Subject: [PATCH] m4: Backport ax_prog_cc_for_build.m4 macros
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +6 -6
@@ -1,4 +1,4 @@ -From 5905b406c5325442f2001339937ad22b2d068b15 Mon Sep 17 00:00:00 2001 +From a99f2283ed13b03185b67ddda507aed3aa0f595e Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 11 Mar 2020 19:56:55 +0000 Subject: [PATCH] strace: fix reproducibilty issues
@@ -13,19 +13,19 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 3c6228a..43b94ea 100755 +index d71e1c1..c191673 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -46,7 +46,7 @@ while read -r name arg0 args; do { +@@ -52,7 +52,7 @@ while read -r name arg0 args; do { hdr="\ #!/bin/sh -efu -# Generated by $0 from $input ($name $arg0 $args); do not edit." +# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." - case "$arg0" in - +*) -@@ -102,7 +102,7 @@ while read -r name arg0 args; do { + # A generated test may be sourced while another build regenerates it. + # Replace the file atomically so the reader keeps its original contents. +@@ -112,7 +112,7 @@ while read -r name arg0 args; do { if [ -n "$names" ]; then {
meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +1 -1
@@ -1,4 +1,4 @@ -From bcca8619f749ba78a4ce78d39c603e2606175175 Mon Sep 17 00:00:00 2001 +From 85eb02371ea47e79f912fa03dbe03c849c093b36 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:56:13 -0800 Subject: [PATCH] tests: Replace off64_t with off_t
meta/recipes-devtools/strace/strace/Makefile-ptest.patch +3 -3
@@ -1,4 +1,4 @@ -From 2749699b77b4fcce7e6e960f246259b05f3dafcc Mon Sep 17 00:00:00 2001 +From f7ad423f864c5f882c7e220f564a21e9421ac73b Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <[email protected]> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 84a9638..23fd218 100644 +index 12b63b2..1ddf782 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -24,7 +24,7 @@ index 84a9638..23fd218 100644 AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -968,3 +969,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) +@@ -982,3 +983,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) CLEANFILES = ksysent.h include ../src/scno.am
meta/recipes-devtools/strace/strace/ptest-spacesave.patch +3 -3
@@ -1,4 +1,4 @@ -From ae538d4dcb0ea7265d72671b7dd3537ca1356437 Mon Sep 17 00:00:00 2001 +From 0bcea4d97bdbfba5920ceb56215a911c9d529dc6 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 29 May 2019 00:10:32 +0100 Subject: [PATCH] strace: Tweak ptest disk space management
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [specific to OE image space issues] 1 file changed, 1 insertion(+) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index f22ad08..3c6228a 100755 +index 2a7fada..d71e1c1 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -84,6 +84,7 @@ while read -r name arg0 args; do { +@@ -93,6 +93,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" run_strace_match_diff $arg0 $args
meta/recipes-devtools/strace/strace/skip-load.patch +1 -1
@@ -1,4 +1,4 @@ -From 2653515537b66a4b1286be107e9ef406c55040b4 Mon Sep 17 00:00:00 2001 +From 5c9048988e5000fb0f175afde05a23be2ef0fa15 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Sat, 30 Aug 2025 00:47:03 +0200 Subject: [PATCH] strace: skip a number of load-sensitive tests
meta/recipes-devtools/strace/strace/update-gawk-paths.patch +1 -1
@@ -1,4 +1,4 @@ -From be1b3d74ca4ffb3c8d3e38fdb96f23d5920f8ef1 Mon Sep 17 00:00:00 2001 +From 3c4da31783f127d18cf1b64ca33ac46a512da2cb Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk
meta/recipes-devtools/strace/strace_7.3.bb renamed from meta/recipes-devtools/strace/strace_7.2.bb +3 -5
@@ -14,12 +14,10 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ - file://0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch \ + file://0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch \ + file://0001-Handle-both-bpf-link-and-bpf_link-anon_inode-names.patch \ " -SRC_URI:append:libc-musl = "\ - file://0001-Ignore-pwritev-pwrite64-tests-on-musl.patch \ - " -SRC_URI[sha256sum] = "4bde6246926890dcee824f6e6ac42a06752f47d77e5097d86e3c0d6d4b709fe5" +SRC_URI[sha256sum] = "529634c40910895a9a1f3c5c1e65da2ca9ed72fb158dfc4bcc89efdf05e39b72" inherit autotools github-releases ptest
PATCH 6/6 icu: Upgrade 78.3 -> 79.1
In reply to Jaipaul CheernamRelease: https://github.com/unicode-org/icu/releases/tag/release-79.1
- Refresh existing patches
- 0001-test-Add-support-ptest.patch updated for 79.1
- Drop copying of testdata as it is part of source now [1]
- Increase ptest QEMU memory to 4G: new 79.1 overflow test ICU-23537 allocates a ~2G buffer, which OOM-kills the test on the default 1G guest [2]
- ptest results (qemux86-64)
995 tests passed, 0 failed, 0 skipped.
License-Update: Copyright years updated.
[1] https://github.com/unicode-org/icu/commit/a9fdce608194b080e1b1372e2ddb53d98822a7ca
[2] https://github.com/unicode-org/icu/commit/d37a22cb9921a76268e325fdca7d3e70a6851191
---
meta/recipes-core/images/core-image-ptest.bb | 1 +
.../0001-Disable-LDFLAGSICUDT-for-Linux.patch | 2 +-
...nicodeStringTest-TestLargeMemory-on-.patch | 7 ++--
...tput-compatible-with-Automake-format.patch | 11 +++---
.../icu/0001-icu-Added-armeb-support.patch | 2 +-
.../icu/icu/0001-test-Add-support-ptest.patch | 35 ++++++-------------
.../icu/icu/mangle-build-tmp.patch | 7 ++--
.../icu/{icu_78.3.bb => icu_79.1.bb} | 7 ++--
8 files changed, 26 insertions(+), 46 deletions(-)
rename meta/recipes-support/icu/{icu_78.3.bb => icu_79.1.bb} (95%)meta/recipes-core/images/core-image-ptest.bb +1 -0
@@ -49,6 +49,7 @@ QB_MEM:virtclass-mcextend-tcl = "-m 5100" QB_MEM:virtclass-mcextend-go = "-m 4096" QB_MEM:virtclass-mcextend-gnutls = "-m 1536" QB_MEM:virtclass-mcextend-zstd = "-m 4096" +QB_MEM:virtclass-mcextend-icu = "-m 4096" TEST_SUITES = "ping ssh parselogs ptest"
meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +1 -1
@@ -1,4 +1,4 @@ -From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 +From 4438ec38c596c273095e114ab683c297c04ac00e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 15 Feb 2014 21:06:42 +0000 Subject: [PATCH] Disable LDFLAGSICUDT for Linux
meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch +2 -5
@@ -1,4 +1,4 @@ -From 4b3e6888c2aaba6465f1bc96f61b17a2513050f3 Mon Sep 17 00:00:00 2001 +From 9d3534a96511fb760fd5c50ce53f37c53874029f Mon Sep 17 00:00:00 2001 From: David Seifert <[email protected]> Date: Sat, 21 Jun 2025 12:28:15 +0200 Subject: [PATCH] ICU-23120 Mask UnicodeStringTest::TestLargeMemory on 32-bit
@@ -11,7 +11,7 @@ Signed-off-by: Daisuke Yamane <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp -index 56976b3e3d2..26225f5b5b5 100644 +index 3f382c5..6049332 100644 --- a/test/intltest/ustrtest.cpp +++ b/test/intltest/ustrtest.cpp @@ -2375,7 +2375,7 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
@@ -23,6 +23,3 @@ index 56976b3e3d2..26225f5b5b5 100644 if(quick) { return; } IcuTestErrorCode status(*this, "TestLargeMemory"); constexpr uint32_t len = 2147483643; --- -2.43.0 -
meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch +4 -7
@@ -1,4 +1,4 @@ -From 4779f798463d673dd74623979ec93141eb60d07a Mon Sep 17 00:00:00 2001 +From b315f37fd8c588632bcf01c43a191ab56a08fbed Mon Sep 17 00:00:00 2001 From: Jiaying Song <[email protected]> Date: Fri, 21 Nov 2025 10:47:59 +0800 Subject: [PATCH] Make ICU test output compatible with Automake format
@@ -22,7 +22,7 @@ Signed-off-by: Jiaying Song <[email protected]> 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index da4f170..514fa0c 100644 +index ec84aae..7e036e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1103,6 +1103,21 @@ If set, it will REPLACE any automatic list of libraries.],
@@ -54,10 +54,10 @@ index da4f170..514fa0c 100644 + + diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp -index 33829b0..bf3ef56 100644 +index f09da7b..9909266 100644 --- a/test/intltest/intltest.cpp +++ b/test/intltest/intltest.cpp -@@ -824,11 +824,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) +@@ -828,11 +828,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) saveBaseLoc[0]=0; /* reset path */ if (lastErrorCount == errorCount) {
@@ -100,6 +100,3 @@ index 7634526..c2e11dd 100644 if(!ON_LINE) { /* had some output */ int spaces = FLAG_INDENT-(depth-1); log_testinfo_i("} %*s[OK] ", spaces, "---"); --- -2.34.1 -
meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +1 -1
@@ -1,4 +1,4 @@ -From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001 +From 0b3d2340ca2a88aeaa41dd2363584ee42930c42b Mon Sep 17 00:00:00 2001 From: Lei Maohui <[email protected]> Date: Wed, 8 May 2019 14:42:30 +0900 Subject: [PATCH] icu: Added armeb support.
meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch +11 -24
@@ -1,18 +1,21 @@ -From 783d9e0d3d7824fbca53c2c3a80e8e5e23eacc82 Mon Sep 17 00:00:00 2001 +From c3ce4ce9b23ec8e6f0966bca8edef6cf937bdc7b Mon Sep 17 00:00:00 2001 From: Daisuke Yamane <[email protected]> Date: Tue, 1 Jul 2025 18:35:25 +0900 Subject: [PATCH] test: Add support ptest Upstream-Status: Inappropriate [oe-core specific] +Note: Updated for 79.1 - dropped the intltest.cpp hunk since upstream +removed that code, kept the four Makefile.in changes. + Signed-off-by: Daisuke Yamane <[email protected]> +Signed-off-by: Jaipaul Cheernam <[email protected]> --- - test/cintltst/Makefile.in | 2 +- - test/intltest/Makefile.in | 2 +- - test/intltest/intltest.cpp | 2 +- - test/iotest/Makefile.in | 2 +- - test/letest/Makefile.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + test/cintltst/Makefile.in | 2 +- + test/intltest/Makefile.in | 2 +- + test/iotest/Makefile.in | 2 +- + test/letest/Makefile.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cintltst/Makefile.in b/test/cintltst/Makefile.in index 552a105..9cf3071 100644
@@ -28,7 +31,7 @@ index 552a105..9cf3071 100644 LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) diff --git a/test/intltest/Makefile.in b/test/intltest/Makefile.in -index 5d4a03b..ca4e4cd 100644 +index 2e44831..d5bd240 100644 --- a/test/intltest/Makefile.in +++ b/test/intltest/Makefile.in @@ -39,7 +39,7 @@ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
@@ -40,19 +43,6 @@ index 5d4a03b..ca4e4cd 100644 endif LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD) -diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp -index 3806d0f..33829b0 100644 ---- a/test/intltest/intltest.cpp -+++ b/test/intltest/intltest.cpp -@@ -1707,7 +1707,7 @@ static bool fileExists(const char* fileName) { - * Returns the path to icu/testdata/ - */ - const char *IntlTest::getSharedTestData(UErrorCode& err) { --#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING ".." U_FILE_SEP_STRING -+#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING - #define REPO_TOP SOURCE_TARBALL_TOP ".." U_FILE_SEP_STRING - #define FILE_NAME U_FILE_SEP_STRING "message2" U_FILE_SEP_STRING "valid-tests.json" - const char *srcDataDir = nullptr; diff --git a/test/iotest/Makefile.in b/test/iotest/Makefile.in index 16c510f..9eeff4b 100644 --- a/test/iotest/Makefile.in
@@ -79,6 +69,3 @@ index 156c86f..555a820 100644 LIBS = $(LIBICULX) $(LIBICUUC) $(LIBICUI18N) $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(ICULEHB_LIBS) COMMONOBJECTS = SimpleFontInstance.o --- -2.43.0 -
meta/recipes-support/icu/icu/mangle-build-tmp.patch +3 -4
@@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a729216a3fbc4d9eda9cbacd8b8dc6670c797978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <[email protected]> Date: Sat, 28 Mar 2026 20:29:53 +0100 Subject: [PATCH] test/udatatst: Mangle /build/tmp
@@ -8,12 +8,11 @@ Content-Transfer-Encoding: 8bit This string matches $TMPDIR (in a kas-container) which triggers the QA check buildpaths: -ERROR: icu-78.2-r0 do_package_qa: QA Issue: File /usr/src/debug/icu/78.2/test/cintltst/udatatst.c in package icu-src contains reference to TMPDIR [buildpaths] +ERROR: icu-78.2-r0 do_package_qa: QA Issue: File /usr/src/debug/icu/78.2/test/cintltst/udatatst.c in package icu-src contains reference to TMPDIR [buildpaths] Signed-off-by: Jörg Sommer <[email protected]> ---- Upstream-Status: Inappropriate [This QA check collision of Yocto specific] - +--- test/cintltst/udatatst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/icu/icu_79.1.bb renamed from meta/recipes-support/icu/icu_78.3.bb +3 -4
@@ -92,7 +92,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=e531a388be7c1df9a0fb7b4010c9c1d7" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=b2329a1b467abf456a6eb531b5000855" ICU_PV = "${PV}" ICU_FOLDER = "${PV}"
@@ -117,8 +117,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "3a2e7a47604ba702f345878308e6fefeca612ee895cf4a5f222e7955fabfe0c0" -SRC_URI[data.sha256sum] = "9d8b3899096aeb83e4e21ef8a40fec9e03b28db18c48452efac882ce25a91e27" +SRC_URI[code.sha256sum] = "06fa63ecb521048f8082f12ad988f6b678d90cbd88aafce24cbc94902b191d99" +SRC_URI[data.sha256sum] = "b3a430009bb5fab77b1a4b98fab85cc8f887e26d4e4166121724298ae14d7224" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases"
@@ -167,7 +167,6 @@ do_install_ptest() { cp -r ${S}/test/testdata ${D}/${PTEST_PATH}/test cp -r ${S}/data/unidata ${D}/${PTEST_PATH}/data/ cp -r ${S}/data/sprep ${D}/${PTEST_PATH}/data/ - cp -r ${S}/../testdata ${D}/${PTEST_PATH}/ cp -r ${B}/test/testdata/out ${D}/${PTEST_PATH}/test/testdata install -d ${D}${PTEST_PATH}/test/tests
Re: [OE-core] [PATCH 6/6] icu: Upgrade 78.3 -> 79.1
Quoted 12 lines · Jaipaul Cheernam
Release: https://github.com/unicode-org/icu/releases/tag/release-79.1
- Refresh existing patches
- 0001-test-Add-support-ptest.patch updated for 79.1
- Drop copying of testdata as it is part of source now [1]
- Increase ptest QEMU memory to 4G: new 79.1 overflow test ICU-23537 allocates a ~2G buffer, which OOM-kills the test on the default 1G guest [2]- ptest results (qemux86-64)
995 tests passed, 0 failed, 0 skipped.
Quoted 6 lines
License-Update: Copyright years updated.
[1] https://github.com/unicode-org/icu/commit/a9fdce608194b080e1b1372e2ddb53d98822a7ca
[2] https://github.com/unicode-org/icu/commit/d37a22cb9921a76268e325fdca7d3e70a6851191Signed-off-by Jaipaul Cheernam <[email protected]>---
Hi Jaipaul,
Thanks for your patch.
It looks like this is failing on riscv:
AssertionError:
Failed ptests:
{'icu': 'START: ptest-runner\n'
...
'ERROR: Exited from signal Killed (9)\n'
'DURATION: 1561\n'}
https://autobuilder.yoctoproject.org/valkyrie/#/builders/56/builds/2672
As usual, qemu is way slower on this platform and might show issues hidden on other platforms.
Can you work on the issue?
Trevor, any thought about it?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 icu: Upgrade 78.3 -> 79.1
In reply to Jaipaul CheernamRelease: https://github.com/unicode-org/icu/releases/tag/release-79.1
- Refresh existing patches
- 0001-test-Add-support-ptest.patch updated for 79.1
- Drop copying of testdata as it is part of source now [1]
- Increase ptest QEMU memory to 4G: new 79.1 overflow test ICU-23537 allocates a ~2G buffer, which OOM-kills the test on the default 1G guest [2]
- ptest results:
qemux86-64: 995 tests passed, 0 failed, 0 skipped
qemuriscv64: 995 tests passed, 0 failed, 0 skipped (~1751s)
License-Update: Copyright years updated.
[1] https://github.com/unicode-org/icu/commit/a9fdce608194b080e1b1372e2ddb53d98822a7ca
[2] https://github.com/unicode-org/icu/commit/d37a22cb9921a76268e325fdca7d3e70a6851191
---
Changes since v1:
- Increase ptest timeout for icu
meta/recipes-core/images/core-image-ptest.bb | 2 ++
.../0001-Disable-LDFLAGSICUDT-for-Linux.patch | 2 +-
...nicodeStringTest-TestLargeMemory-on-.patch | 7 ++--
...tput-compatible-with-Automake-format.patch | 11 +++---
.../icu/0001-icu-Added-armeb-support.patch | 2 +-
.../icu/icu/0001-test-Add-support-ptest.patch | 35 ++++++-------------
.../icu/icu/mangle-build-tmp.patch | 7 ++--
.../icu/{icu_78.3.bb => icu_79.1.bb} | 7 ++--
8 files changed, 27 insertions(+), 46 deletions(-)
rename meta/recipes-support/icu/{icu_78.3.bb => icu_79.1.bb} (95%)meta/recipes-core/images/core-image-ptest.bb +2 -0
@@ -11,6 +11,7 @@ HOMEPAGE = "https://www.yoctoproject.org/" PTESTS = "${PTESTS_SLOW} ${PTESTS_FAST}" PTEST_RUNNER_TIMEOUT:virtclass-mcextend-python3-cffi = "600" PTEST_RUNNER_TIMEOUT:virtclass-mcextend-go = "4800" +PTEST_RUNNER_TIMEOUT:virtclass-mcextend-icu = "2400" IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh"
@@ -49,6 +50,7 @@ QB_MEM:virtclass-mcextend-tcl = "-m 5100" QB_MEM:virtclass-mcextend-go = "-m 4096" QB_MEM:virtclass-mcextend-gnutls = "-m 1536" QB_MEM:virtclass-mcextend-zstd = "-m 4096" +QB_MEM:virtclass-mcextend-icu = "-m 4096" TEST_SUITES = "ping ssh parselogs ptest"
meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +1 -1
@@ -1,4 +1,4 @@ -From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 +From 4438ec38c596c273095e114ab683c297c04ac00e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 15 Feb 2014 21:06:42 +0000 Subject: [PATCH] Disable LDFLAGSICUDT for Linux
meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch +2 -5
@@ -1,4 +1,4 @@ -From 4b3e6888c2aaba6465f1bc96f61b17a2513050f3 Mon Sep 17 00:00:00 2001 +From 9d3534a96511fb760fd5c50ce53f37c53874029f Mon Sep 17 00:00:00 2001 From: David Seifert <[email protected]> Date: Sat, 21 Jun 2025 12:28:15 +0200 Subject: [PATCH] ICU-23120 Mask UnicodeStringTest::TestLargeMemory on 32-bit
@@ -11,7 +11,7 @@ Signed-off-by: Daisuke Yamane <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp -index 56976b3e3d2..26225f5b5b5 100644 +index 3f382c5..6049332 100644 --- a/test/intltest/ustrtest.cpp +++ b/test/intltest/ustrtest.cpp @@ -2375,7 +2375,7 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
@@ -23,6 +23,3 @@ index 56976b3e3d2..26225f5b5b5 100644 if(quick) { return; } IcuTestErrorCode status(*this, "TestLargeMemory"); constexpr uint32_t len = 2147483643; --- -2.43.0 -
meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch +4 -7
@@ -1,4 +1,4 @@ -From 4779f798463d673dd74623979ec93141eb60d07a Mon Sep 17 00:00:00 2001 +From b315f37fd8c588632bcf01c43a191ab56a08fbed Mon Sep 17 00:00:00 2001 From: Jiaying Song <[email protected]> Date: Fri, 21 Nov 2025 10:47:59 +0800 Subject: [PATCH] Make ICU test output compatible with Automake format
@@ -22,7 +22,7 @@ Signed-off-by: Jiaying Song <[email protected]> 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index da4f170..514fa0c 100644 +index ec84aae..7e036e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1103,6 +1103,21 @@ If set, it will REPLACE any automatic list of libraries.],
@@ -54,10 +54,10 @@ index da4f170..514fa0c 100644 + + diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp -index 33829b0..bf3ef56 100644 +index f09da7b..9909266 100644 --- a/test/intltest/intltest.cpp +++ b/test/intltest/intltest.cpp -@@ -824,11 +824,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) +@@ -828,11 +828,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) saveBaseLoc[0]=0; /* reset path */ if (lastErrorCount == errorCount) {
@@ -100,6 +100,3 @@ index 7634526..c2e11dd 100644 if(!ON_LINE) { /* had some output */ int spaces = FLAG_INDENT-(depth-1); log_testinfo_i("} %*s[OK] ", spaces, "---"); --- -2.34.1 -
meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +1 -1
@@ -1,4 +1,4 @@ -From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001 +From 0b3d2340ca2a88aeaa41dd2363584ee42930c42b Mon Sep 17 00:00:00 2001 From: Lei Maohui <[email protected]> Date: Wed, 8 May 2019 14:42:30 +0900 Subject: [PATCH] icu: Added armeb support.
meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch +11 -24
@@ -1,18 +1,21 @@ -From 783d9e0d3d7824fbca53c2c3a80e8e5e23eacc82 Mon Sep 17 00:00:00 2001 +From c3ce4ce9b23ec8e6f0966bca8edef6cf937bdc7b Mon Sep 17 00:00:00 2001 From: Daisuke Yamane <[email protected]> Date: Tue, 1 Jul 2025 18:35:25 +0900 Subject: [PATCH] test: Add support ptest Upstream-Status: Inappropriate [oe-core specific] +Note: Updated for 79.1 - dropped the intltest.cpp hunk since upstream +removed that code, kept the four Makefile.in changes. + Signed-off-by: Daisuke Yamane <[email protected]> +Signed-off-by: Jaipaul Cheernam <[email protected]> --- - test/cintltst/Makefile.in | 2 +- - test/intltest/Makefile.in | 2 +- - test/intltest/intltest.cpp | 2 +- - test/iotest/Makefile.in | 2 +- - test/letest/Makefile.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + test/cintltst/Makefile.in | 2 +- + test/intltest/Makefile.in | 2 +- + test/iotest/Makefile.in | 2 +- + test/letest/Makefile.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cintltst/Makefile.in b/test/cintltst/Makefile.in index 552a105..9cf3071 100644
@@ -28,7 +31,7 @@ index 552a105..9cf3071 100644 LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) diff --git a/test/intltest/Makefile.in b/test/intltest/Makefile.in -index 5d4a03b..ca4e4cd 100644 +index 2e44831..d5bd240 100644 --- a/test/intltest/Makefile.in +++ b/test/intltest/Makefile.in @@ -39,7 +39,7 @@ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
@@ -40,19 +43,6 @@ index 5d4a03b..ca4e4cd 100644 endif LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD) -diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp -index 3806d0f..33829b0 100644 ---- a/test/intltest/intltest.cpp -+++ b/test/intltest/intltest.cpp -@@ -1707,7 +1707,7 @@ static bool fileExists(const char* fileName) { - * Returns the path to icu/testdata/ - */ - const char *IntlTest::getSharedTestData(UErrorCode& err) { --#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING ".." U_FILE_SEP_STRING -+#define SOURCE_TARBALL_TOP U_TOPSRCDIR U_FILE_SEP_STRING - #define REPO_TOP SOURCE_TARBALL_TOP ".." U_FILE_SEP_STRING - #define FILE_NAME U_FILE_SEP_STRING "message2" U_FILE_SEP_STRING "valid-tests.json" - const char *srcDataDir = nullptr; diff --git a/test/iotest/Makefile.in b/test/iotest/Makefile.in index 16c510f..9eeff4b 100644 --- a/test/iotest/Makefile.in
@@ -79,6 +69,3 @@ index 156c86f..555a820 100644 LIBS = $(LIBICULX) $(LIBICUUC) $(LIBICUI18N) $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(ICULEHB_LIBS) COMMONOBJECTS = SimpleFontInstance.o --- -2.43.0 -
meta/recipes-support/icu/icu/mangle-build-tmp.patch +3 -4
@@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a729216a3fbc4d9eda9cbacd8b8dc6670c797978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <[email protected]> Date: Sat, 28 Mar 2026 20:29:53 +0100 Subject: [PATCH] test/udatatst: Mangle /build/tmp
@@ -8,12 +8,11 @@ Content-Transfer-Encoding: 8bit This string matches $TMPDIR (in a kas-container) which triggers the QA check buildpaths: -ERROR: icu-78.2-r0 do_package_qa: QA Issue: File /usr/src/debug/icu/78.2/test/cintltst/udatatst.c in package icu-src contains reference to TMPDIR [buildpaths] +ERROR: icu-78.2-r0 do_package_qa: QA Issue: File /usr/src/debug/icu/78.2/test/cintltst/udatatst.c in package icu-src contains reference to TMPDIR [buildpaths] Signed-off-by: Jörg Sommer <[email protected]> ---- Upstream-Status: Inappropriate [This QA check collision of Yocto specific] - +--- test/cintltst/udatatst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/icu/icu_79.1.bb renamed from meta/recipes-support/icu/icu_78.3.bb +3 -4
@@ -92,7 +92,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=e531a388be7c1df9a0fb7b4010c9c1d7" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=b2329a1b467abf456a6eb531b5000855" ICU_PV = "${PV}" ICU_FOLDER = "${PV}"
@@ -117,8 +117,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "3a2e7a47604ba702f345878308e6fefeca612ee895cf4a5f222e7955fabfe0c0" -SRC_URI[data.sha256sum] = "9d8b3899096aeb83e4e21ef8a40fec9e03b28db18c48452efac882ce25a91e27" +SRC_URI[code.sha256sum] = "06fa63ecb521048f8082f12ad988f6b678d90cbd88aafce24cbc94902b191d99" +SRC_URI[data.sha256sum] = "b3a430009bb5fab77b1a4b98fab85cc8f887e26d4e4166121724298ae14d7224" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases"
@@ -167,7 +167,6 @@ do_install_ptest() { cp -r ${S}/test/testdata ${D}/${PTEST_PATH}/test cp -r ${S}/data/unidata ${D}/${PTEST_PATH}/data/ cp -r ${S}/data/sprep ${D}/${PTEST_PATH}/data/ - cp -r ${S}/../testdata ${D}/${PTEST_PATH}/ cp -r ${B}/test/testdata/out ${D}/${PTEST_PATH}/test/testdata install -d ${D}${PTEST_PATH}/test/tests