gn: upgrade to latest revision
PATCH 1/15 gn: upgrade to latest revision
From: Alexander Kanavin <[email protected]>
Remove patch as issue is fixed upstream.
--- ...001-gn-fix-build-with-gcc-16-on-musl.patch | 33 ------------------- meta/recipes-devtools/gn/gn_git.bb | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 meta/recipes-devtools/gn/files/0001-gn-fix-build-with-gcc-16-on-musl.patch
meta/recipes-devtools/gn/files/0001-gn-fix-build-with-gcc-16-on-musl.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 6d22f5c9e96811f1abcedd8fb1849fe72747b5c4 Mon Sep 17 00:00:00 2001 -From: Hemanth Kumar M D <[email protected]> -Date: Mon, 11 May 2026 02:43:10 -0700 -Subject: [PATCH] gn: fix build with GCC 16 on musl - -Add missing <cstdint> include in src/gn/pool.h for int64_t. - -Fixes: -| ../sources/gn-0+git/src/gn/pool.h:26:3: error: 'int64_t' does not name a type - -Upstream-Status: Submitted [https://gn-review.googlesource.com/c/gn/+/22740] - -Signed-off-by: Hemanth Kumar M D <[email protected]> - ---- - src/gn/pool.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gn/pool.h b/src/gn/pool.h -index e03113608..247cb6425 100644 ---- a/src/gn/pool.h -+++ b/src/gn/pool.h -@@ -6,6 +6,7 @@ - #define TOOLS_GN_POOL_H_ - - #include <string> -+#include <cstdint> - - #include "gn/item.h" - --- -2.49.0 -
meta/recipes-devtools/gn/gn_git.bb +1 -2
@@ -7,9 +7,8 @@ DEPENDS += "ninja-native" UPSTREAM_CHECK_COMMITS = "1" SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main \ - file://0001-gn-fix-build-with-gcc-16-on-musl.patch \ " -SRCREV = "eab8a9f92dca9b8548a89d9e5eb6aeb8ac6bba77" +SRCREV = "bac66cfc3254aabcd8640c8ebbeb6d62a198d454" PV = "0+git" BB_GIT_SHALLOW = ""
Signature · 1 line
2.47.3
PATCH 2/15 util-linux: upgrade 2.41.3 -> 2.42.2
From: Alexander Kanavin <[email protected]>
---
...2.41.3.bb => util-linux-libuuid_2.42.2.bb} | 0
meta/recipes-core/util-linux/util-linux.inc | 6 +-
...DEV_FL_NOFOLLOW-to-prevent-symlink-a.patch | 114 ------------------
...gn-sockets-skip-when-lacking-sock_di.patch | 33 -----
...ests-script-Disable-size-option-test.patch | 13 +-
...code-avoid-using-shell-built-in-kill.patch | 33 -----
...se-RTMIN-from-kill-L-instead-of-hard.patch | 55 ---------
.../util-linux/avoid_parallel_tests.patch | 4 +-
.../util-linux/configure-sbindir.patch | 4 +-
.../display_testname_for_subtest.patch | 4 +-
.../util-linux/util-linux/ptest.patch | 6 +-
.../util-linux/util-linux/run-ptest | 5 +-
...l-linux_2.41.3.bb => util-linux_2.42.2.bb} | 2 +-
13 files changed, 20 insertions(+), 259 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-libuuid_2.41.3.bb => util-linux-libuuid_2.42.2.bb} (100%)
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-loopdev-add-LOOPDEV_FL_NOFOLLOW-to-prevent-symlink-a.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch
rename meta/recipes-core/util-linux/{util-linux_2.41.3.bb => util-linux_2.42.2.bb} (99%)meta/recipes-core/util-linux/util-linux-libuuid_2.42.2.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.41.3.bb +0 -0
meta/recipes-core/util-linux/util-linux.inc +1 -5
@@ -16,13 +16,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ - file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ - file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ file://0001-tests-script-Disable-size-option-test.patch \ - file://0001-loopdev-add-LOOPDEV_FL_NOFOLLOW-to-prevent-symlink-a.patch \ " -SRC_URI[sha256sum] = "3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b" +SRC_URI[sha256sum] = "03a05d3adf9602ef128f2da05b84b3205ce60c351e5737c0370f74000679ce8a" CVE_PRODUCT = "util-linux"
meta/recipes-core/util-linux/util-linux/0001-loopdev-add-LOOPDEV_FL_NOFOLLOW-to-prevent-symlink-a.patch deleted +0 -114
114 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 855dbea3e6b3c7ed9ba11eff38f888cc4b7678c8 Mon Sep 17 00:00:00 2001 -From: Chen Qi <[email protected]> -Date: Mon, 26 May 2025 15:24:16 +0800 -Subject: [PATCH] lsfd/mkfds-foreign-sockets: skip when lacking sock_diag - ability - -The ENDPOINTS will need sock_diag ability. The kernel might not -enable related configs. Check and skip in case of lacking such ability. - -Fixes: https://github.com/util-linux/util-linux/issues/3590 - -Signed-off-by: Chen Qi <[email protected]> - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3591] - -Signed-off-by: Chen Qi <[email protected]> ---- - tests/ts/lsfd/mkfds-foreign-sockets | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/ts/lsfd/mkfds-foreign-sockets b/tests/ts/lsfd/mkfds-foreign-sockets -index cd94da7..76138a7 100755 ---- a/tests/ts/lsfd/mkfds-foreign-sockets -+++ b/tests/ts/lsfd/mkfds-foreign-sockets -@@ -30,6 +30,8 @@ ts_skip_nonroot - ts_skip_qemu_user - ts_cd "$TS_OUTDIR" - -+lsfd_check_sockdiag "unix" -+ - declare -A tcase - tcase[NAME]="state=connected" - tcase[SOCK.NETNS]=
meta/recipes-core/util-linux/util-linux/0001-tests-script-Disable-size-option-test.patch +5 -8
@@ -1,4 +1,4 @@ -From 1d38887185c0424a82bcf05efbd8585df1bba8cf Mon Sep 17 00:00:00 2001 +From 078231e4ecb5fa12107cd463f42e4c63ef3ff15c Mon Sep 17 00:00:00 2001 From: Paul Barker <[email protected]> Date: Mon, 5 Jan 2026 09:56:41 +0000 Subject: [PATCH] tests: script: Disable size option test
@@ -24,20 +24,17 @@ Signed-off-by: Paul Barker <[email protected]> 1 file changed, 6 deletions(-) diff --git a/tests/ts/script/options b/tests/ts/script/options -index 3cbd5c8ab463..4da51cd83c66 100755 +index f46cc34..537ea31 100755 --- a/tests/ts/script/options +++ b/tests/ts/script/options -@@ -57,10 +57,4 @@ $TS_HELPER_SCRIPT --return --append -c "exit 127" $TS_OUTPUT </dev/null >/dev/nu - echo $? >> $TS_OUTPUT +@@ -103,10 +103,4 @@ $TS_HELPER_SCRIPT -Bc -- echo dashdash-bundle </dev/null >/dev/null 2>&1 + mv c "$TS_OUTPUT" ts_finalize_subtest -ts_init_subtest "size" -$TS_HELPER_SCRIPT --output-limit 9 --command "echo 1:1234567890" $TS_OUTPUT </dev/null >/dev/null 2>&1 --$TS_HELPER_SCRIPT -a -o 9 --command "echo 2:1234567890" $TS_OUTPUT </dev/null >/dev/null 2>&1 +-$TS_HELPER_SCRIPT -a --output-limit 9 --command "echo 2:1234567890" $TS_OUTPUT </dev/null >/dev/null 2>&1 -echo $? >> $TS_OUTPUT -ts_finalize_subtest - ts_finalize --- -2.43.0 -
meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 514ff160e37c0cca5eee79892a6b65516a92de34 Mon Sep 17 00:00:00 2001 -From: Chen Qi <[email protected]> -Date: Thu, 15 May 2025 16:44:33 +0800 -Subject: [PATCH] tests/ts/kill/decode: avoid using shell built-in kill command - -This test case should do the same as other kill test cases, avoiding -using shell built-in kill command. - -Signed-off-by: Chen Qi <[email protected]> - -Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/d2eeccf36542d506b660641a07a44f3976772897] - -Signed-off-by: Chen Qi <[email protected]> ---- - tests/ts/kill/decode | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode -index 03bc25f..5714989 100755 ---- a/tests/ts/kill/decode -+++ b/tests/ts/kill/decode -@@ -18,6 +18,11 @@ TS_DESC="decode functions" - . "$TS_TOPDIR/functions.sh" - ts_init "$*" - -+# make sure we do not use shell built-in command -+if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -+ TS_CMD_KILL="$(which kill)" -+fi -+ - ts_skip_qemu_user - - ts_check_test_command "$TS_CMD_KILL"
meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +2 -2
@@ -1,4 +1,4 @@ -From 1f55d079887f0ef7857819e9c8a1def8180c69d4 Mon Sep 17 00:00:00 2001 +From 4303ca5212f78fa276be750e077303f5090b7e33 Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Mon, 14 Jun 2021 14:00:31 +0200 Subject: [PATCH] util-linux: Add ptest
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f664d12..8d9efaa 100644 +index e2061e7..f816656 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4])
meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +2 -2
@@ -1,4 +1,4 @@ -From d521ca39a781873882b52ee52f46294596f41848 Mon Sep 17 00:00:00 2001 +From d91f680b43b0c70ee7c4f3b74996c342ca15129e Mon Sep 17 00:00:00 2001 From: Phil Blundell <[email protected]> Date: Mon, 24 Sep 2012 07:24:51 +0100 Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [configuration] 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d32b11d..f664d12 100644 +index 13bed69..e2061e7 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,10 @@ AC_SUBST([runstatedir])
meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch +2 -2
@@ -1,4 +1,4 @@ -From 05b495cbe9ffa7b45d9a383610aa95e31f2ab1e3 Mon Sep 17 00:00:00 2001 +From 42cfda0aa633f3a6786be1e490202cc9fe89e4e5 Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Display testname for subtest
@@ -10,7 +10,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions.sh b/tests/functions.sh -index 1d7a425..b1f0986 100644 +index f92520a..c32005c 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -455,7 +455,7 @@ function ts_init_subtest {
meta/recipes-core/util-linux/util-linux/ptest.patch +3 -3
@@ -1,4 +1,4 @@ -From 4c0e374ba6c64d07da8acba5476cf8638c54820d Mon Sep 17 00:00:00 2001 +From 238020ed859acb41f1f43352afc28db14cecb34e Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Define TESTS variable
@@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index 01e9970..c3313ff 100644 +index 02db406..e09d6df 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -66,6 +66,7 @@ sysusers_DATA = +@@ -67,6 +67,7 @@ sysusers_DATA = dist_bashcompletion_DATA = check_PROGRAMS = dist_check_SCRIPTS =
meta/recipes-core/util-linux/util-linux/run-ptest +4 -1
@@ -23,7 +23,10 @@ modprobe loop mount --make-shared / # lsfd/mkfds-bpf* have issues with the gcc 15 upgrade -./tests/run.sh --use-system-commands --parsable --show-diff --exclude='lsfd/mkfds-bpf-map lsfd/mkfds-bpf-prog' | sed -u '{ +# +# chrt/chrt-ext needs skipping due to linux-yocto not enabling SCHED_EXT: +# https://github.com/util-linux/util-linux/issues/4429 +./tests/run.sh --use-system-commands --parsable --show-diff --exclude='chrt/chrt-ext lsfd/mkfds-bpf-map lsfd/mkfds-bpf-prog' | sed -u '{ s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/
meta/recipes-core/util-linux/util-linux_2.42.2.bb renamed from meta/recipes-core/util-linux/util-linux_2.41.3.bb +1 -1
@@ -424,7 +424,7 @@ do_install_ptest() { do_install_ptest:append:libc-musl() { for t in tests/ts/col/multibyte \ tests/ts/lib/timeutils \ - tests/ts/misc/enosys \ + tests/ts/enosys \ tests/ts/dmesg/limit; do rm -rf ${D}${PTEST_PATH}/$t done
Signature · 1 line
2.47.3
PATCH 3/15 lttng-tools: upgrade 2.14.1 -> 2.15.1
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Adjust ptest tweaks and packaging to account for test data and test cases changes/renames.
Add a patch to address reproducibility issues.
---
...static.m4-do-not-write-generation-da.patch | 27 +++++++++++++++
...-tests-do-not-strip-a-helper-library.patch | 31 +++++++++--------
.../lttng/lttng-tools/disable-tests.patch | 11 ++++---
.../lttng/lttng-tools/disable-tests2.patch | 31 ++++++++++++-----
.../lttng/lttng-tools/libc++.patch | 33 ++++++++++++-------
.../lttng/lttng-tools/run-ptest | 2 +-
...-tools_2.14.1.bb => lttng-tools_2.15.1.bb} | 26 ++++++++-------
7 files changed, 110 insertions(+), 51 deletions(-)
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-m4-ax_am_macros_static.m4-do-not-write-generation-da.patch
rename meta/recipes-kernel/lttng/{lttng-tools_2.14.1.bb => lttng-tools_2.15.1.bb} (91%)meta/recipes-kernel/lttng/lttng-tools/0001-m4-ax_am_macros_static.m4-do-not-write-generation-da.patch new file +27 -0
@@ -0,0 +1,27 @@ +From c58eed85e47a605e2a9f2b2bc91917f68bec023f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 18 Jun 2026 16:48:40 +0200 +Subject: [PATCH] m4/ax_am_macros_static.m4: do not write generation date into + Makefiles + +This breaks reproducibility of ptests (which install the Makefiles), +but the fix isn't appropriate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific, really!] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + m4/ax_am_macros_static.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ax_am_macros_static.m4 b/m4/ax_am_macros_static.m4 +index f4cee8c..7fba5b2 100644 +--- a/m4/ax_am_macros_static.m4 ++++ b/m4/ax_am_macros_static.m4 +@@ -33,6 +33,6 @@ AC_DEFUN([AX_AM_MACROS_STATIC], + [ + AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[ + # ]AMINCLUDE_STATIC[ generated automatically by Autoconf +-# from AX_AM_MACROS_STATIC on ]m4_esyscmd([LC_ALL=C date])[ ++# from AX_AM_MACROS_STATIC + ]) + ])
meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch +17 -14
@@ -1,24 +1,27 @@ -From a45157a50e14d4bd244a3dd05d79c5703c819550 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Thu, 12 Dec 2019 16:52:07 +0100 +From 8e56c9b414b60db1a14ea8ca664e2cff941ae14d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 17 Jun 2026 10:04:13 +0200 Subject: [PATCH] tests: do not strip a helper library Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> --- - tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 2 +- + tests/utils/testapp/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -index 836f13e..e19a554 100644 ---- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -+++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -@@ -14,7 +14,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la - libfoo.strip: libfoo.la - $(OBJCOPY) --strip-all .libs/libfoo.so +diff --git a/tests/utils/testapp/Makefile.am b/tests/utils/testapp/Makefile.am +index 131a4af..38ce076 100644 +--- a/tests/utils/testapp/Makefile.am ++++ b/tests/utils/testapp/Makefile.am +@@ -363,7 +363,7 @@ endif # TEST_SDT_UPROBE + TEST_DEPS = gen-py-events.py + EXTRA_DIST += gen-py-events.py --all-local: libfoo.strip +-all-local: libdynsym.strip-stamp +all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for script in $(EXTRA_DIST); do \ - cp -f $(srcdir)/$$script $(builddir); \ + for script in $(TEST_DEPS); do \ + if [ x"$$(dirname $$script)" != x"." ]; then \ +-- +2.47.3 +
meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch +6 -5
@@ -1,4 +1,4 @@ -From 05cf8ed6cc42a2f6ff53009d0ae2713fe63f1245 Mon Sep 17 00:00:00 2001 +From 44c14ba25747ccee72667212003658447d8297ae Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Tue, 14 Dec 2021 12:34:04 +0000 Subject: [PATCH] lttng-tools: Disable problem tests
@@ -14,14 +14,14 @@ https://bugzilla.yoctoproject.org/show_bug.cgi?id=14263 Signed-off-by: Richard Purdie <[email protected]> --- - tests/regression/Makefile.am | 12 ------------ - 1 file changed, 12 deletions(-) + tests/regression/Makefile.am | 13 ------------- + 1 file changed, 13 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am -index 7076488..e5be904 100644 +index 6730ff9..a7cd133 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am -@@ -40,18 +40,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ +@@ -46,19 +46,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/regen-metadata/test_ust \ tools/regen-statedump/test_kernel \ tools/regen-statedump/test_ust \
@@ -37,6 +37,7 @@ index 7076488..e5be904 100644 - tools/notification/test_notification_notifier_discarded_count \ - tools/notification/test_notification_kernel_userspace_probe \ - tools/notification/test_notification_multi_app \ +- tools/notification/test_rotation \ tools/rotation/test_ust \ tools/rotation/test_kernel \ tools/rotation/test_ust_kernel \
meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch +23 -8
@@ -1,28 +1,43 @@ +From 16890a3395d62e760ce11c3c5e1b7323e1b79b46 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Tue, 19 Aug 2025 10:09:07 +0100 +Subject: [PATCH] lttng-tools: Disable slow tests to fix ptest runs + These tests take too long to run for our default output timeout in ptest-runner (450s). We could change that to 900s but it is a global setting so skip these tests for now. Ideally tests.serial would have occasional output when running to show activity. Upstream-Status: Inappropriate [workaround for slow tests] Signed-off-by: Richard Purdie <[email protected]> +--- + tests/regression/Makefile.am | 3 --- + 1 file changed, 3 deletions(-) -Index: lttng-tools-2.14.0/tests/regression/Makefile.am -=================================================================== ---- lttng-tools-2.14.0.orig/tests/regression/Makefile.am -+++ lttng-tools-2.14.0/tests/regression/Makefile.am -@@ -26,7 +26,6 @@ SERIAL_TESTS = tools/base-path/test_ust +diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am +index a7cd133..b5a25eb 100644 +--- a/tests/regression/Makefile.am ++++ b/tests/regression/Makefile.am +@@ -30,7 +30,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ tools/exclusion/test_exclusion \ - tools/snapshots/test_kernel \ tools/snapshots/test_ust_fast \ + tools/snapshots/test_ust_long \ tools/snapshots/test_ust_streaming \ - tools/snapshots/test_kernel_streaming \ -@@ -47,8 +46,6 @@ SERIAL_TESTS = tools/base-path/test_ust +@@ -53,7 +52,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/rotation/test_schedule_api \ tools/metadata/test_kernel \ tools/working-directory/test_relayd_working_directory \ -- tools/clear/test_ust \ - tools/clear/test_kernel \ tools/clear/test_live_hang.py \ tools/tracker/test_event_tracker \ tools/trigger/start-stop/test_start_stop \ +@@ -66,7 +64,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ + tools/trace-format/test_trace_format_kernel.py + + TESTS = tools/clear/test_disallow.py \ +- tools/clear/test_ust.py \ + tools/clear/test_ust_multi_user.py \ + tools/live/test_early_inactive_app.py \ + tools/live/test_high_latency.py \
meta/recipes-kernel/lttng/lttng-tools/libc++.patch +22 -11
@@ -1,4 +1,11 @@ -sessiond: avoid std::vector range-ctor on non-standard iterators (libc++) +From 348e1be1cdfb897bc8a907e1a806cc7591efae8a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 20 Aug 2025 23:45:20 -0700 +Subject: [PATCH] sessiond: avoid std::vector range-ctor on non-standard + iterators (libc++) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit libc++ SFINAE-gates std::vector(It, It) behind standard iterator requirements. The events_view/channels_ht_view iterators don’t model Input/Forward, so the
@@ -9,12 +16,16 @@ libstdc++ behavior unchanged. Upstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/15163] Signed-off-by: Khem Raj <[email protected]> +--- + src/bin/lttng-sessiond/ust-registry-channel.cpp | 7 +++++-- + src/bin/lttng-sessiond/ust-registry-session.cpp | 7 +++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) -Index: lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-channel.cpp -=================================================================== ---- lttng-tools-2.14.0.orig/src/bin/lttng-sessiond/ust-registry-channel.cpp -+++ lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-channel.cpp -@@ -529,8 +529,11 @@ void lsu::registry_channel::_accept_on_e +diff --git a/src/bin/lttng-sessiond/ust-registry-channel.cpp b/src/bin/lttng-sessiond/ust-registry-channel.cpp +index 45be2cc..01d5db3 100644 +--- a/src/bin/lttng-sessiond/ust-registry-channel.cpp ++++ b/src/bin/lttng-sessiond/ust-registry-channel.cpp +@@ -529,8 +529,11 @@ void lsu::registry_channel::_accept_on_event_classes( events_view(*_events->ht); /* Copy the event ptrs from the _events ht to this vector which we'll sort. */
@@ -28,11 +39,11 @@ Index: lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-channel.cpp std::sort(sorted_event_classes.begin(), sorted_event_classes.end(), -Index: lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-session.cpp -=================================================================== ---- lttng-tools-2.14.0.orig/src/bin/lttng-sessiond/ust-registry-session.cpp -+++ lttng-tools-2.14.0/src/bin/lttng-sessiond/ust-registry-session.cpp -@@ -586,8 +586,11 @@ void lsu::registry_session::_accept_on_s +diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp +index 693fc71..b355a14 100644 +--- a/src/bin/lttng-sessiond/ust-registry-session.cpp ++++ b/src/bin/lttng-sessiond/ust-registry-session.cpp +@@ -587,8 +587,11 @@ void lsu::registry_session::_accept_on_stream_classes(lst::trace_class_visitor& decltype(lsu::registry_channel::_node), &lsu::registry_channel::_node> channels_ht_view(*_channels->ht);
meta/recipes-kernel/lttng/lttng-tools/run-ptest +1 -1
@@ -20,7 +20,7 @@ function validate_lttng_modules_present() return 1 } -export LD_LIBRARY_PATH=FIXMEPTESTPATH/tests/utils/testapp/userspace-probe-elf-binary/.libs:FIXMEPTESTPATH/tests/utils/testapp/gen-ust-events-constructor/.libs +export LD_LIBRARY_PATH=FIXMEPTESTPATH/tests/utils/testapp/.libs:FIXMEPTESTPATH/tests/utils/testapp/gen-ust-events-constructor/.libs makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=FIXMEPTESTPATH top_builddir=FIXMEPTESTPATH" #If current system doesn't have lttng kernel modules, disable lttng kernel related tests.
meta/recipes-kernel/lttng/lttng-tools_2.15.1.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb +14 -12
@@ -29,6 +29,7 @@ RDEPENDS:${PN}-ptest += "perl-module-getopt-long \ python3-io \ python3-shell \ python3-xml \ + python3-resource \ " INSANE_SKIP:${PN}-ptest += "dev-deps"
@@ -50,9 +51,10 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://disable-tests.patch \ file://disable-tests2.patch \ file://libc++.patch \ + file://0001-m4-ax_am_macros_static.m4-do-not-write-generation-da.patch \ " -SRC_URI[sha256sum] = "0e68eb27923621c4bc127cfce40422d28cf7e473fedf6229ae6c32ba5c5b7c6d" +SRC_URI[sha256sum] = "8b6d4ba7ae2c036f7dafbb4e29717677411078f9a9d961b2dc7c1ba16273e9e9" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
@@ -95,7 +97,7 @@ do_install_ptest () { install -D "${B}/$f" "${D}${PTEST_PATH}/$f" done - for f in tests/utils/tap-driver.sh config/test-driver src/common/session.xsd src/common/mi-lttng-4.1.xsd \ + for f in tests/utils/tap-driver.sh config/test-driver src/common/session.xsd src/common/mi-lttng-4.2.xsd \ tests/regression/tests.serial; do install -D "${S}/$f" "${D}${PTEST_PATH}/$f" done
@@ -140,8 +142,8 @@ do_install_ptest () { done done - chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary - chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so
@@ -207,12 +209,12 @@ do_install_ptest:append:libc-musl () { } INHIBIT_PACKAGE_STRIP_FILES = "\ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/userspace-probe-elf-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/userspace-probe-elf-cxx-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/gen-syscall-events \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/gen-syscall-events-callstack \ "
Signature · 1 line
2.47.3
PATCH 4/15 lttng-modules: upgrade 2.14.4 -> 2.15.1
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop a backported patch.
---
...st-range-in-btrfs-probe-for-v6.18.14.patch | 36 -------------------
...ts-during-the-folios-writeback-v6.17.patch | 11 +++---
...trace-event-i_ino-fields-to-u64-v7.1.patch | 9 ++---
...p-unnecessary-pointer-indirection-in.patch | 9 ++---
...ce-trace-noise-in-hrtimer_start-v7.1.patch | 10 ++----
...onvert-pageout-to-take-a-folio-v5.18.patch | 9 ++---
...group-IDs-to-vmscan-tracepoints-v7.1.patch | 10 ++----
...i_ino-from-unsigned-long-to-u64-v7.1.patch | 11 +++---
...trace-event-i_ino-fields-to-u64-v7.1.patch | 9 ++---
...e-missing-CONFIG_TRACEPOINTS-to-warn.patch | 16 +++++----
...ules_2.14.4.bb => lttng-modules_2.15.1.bb} | 3 +-
11 files changed, 36 insertions(+), 97 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.14.4.bb => lttng-modules_2.15.1.bb} (92%)meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From de7ca66c797ba0b3273a217a47c8fb791d896f7c Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <[email protected]> -Date: Fri, 27 Feb 2026 17:54:39 -0500 -Subject: [PATCH] fix: adjust range in btrfs probe for v6.18.14 - -Upstream commit c5667f9c8eb9 ("btrfs: headers cleanup to remove -unnecessary local includes") was backported in v6.18.14, adjust the -range accordingly in the btrfs probe. - -Upstream-Status: Backport from commit ca93dc3b05fcb - -Change-Id: I51c5cb6345c6a1e1aa4e5e3cb9a4af2ec962ecb2 -Signed-off-by: Michael Jeanson <[email protected]> -Signed-off-by: Mathieu Desnoyers <[email protected]> -Signed-off-by: Xiangyu Chen <[email protected]> ---- - include/instrumentation/events/btrfs.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h -index feb4f40b..e87f0085 100644 ---- a/include/instrumentation/events/btrfs.h -+++ b/include/instrumentation/events/btrfs.h -@@ -12,7 +12,8 @@ - #include <linux/writeback.h> - #include <lttng/kernel-version.h> - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0) || \ -+ LTTNG_KERNEL_RANGE(6,18,14, 6,19,0)) - #include <../fs/btrfs/ordered-data.h> - #endif - --- -2.47.3 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch +4 -7
@@ -1,8 +1,8 @@ -From 329ef88b9ae02228387f55a61ca1cef87a5cf3f4 Mon Sep 17 00:00:00 2001 +From 8abda1d7c6b4a6346ef79e1b677ced4077c6b96e Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 16:22:42 -0400 -Subject: [PATCH 7/8] fix: ext4: enhance tracepoints during the folios - writeback (v6.17) +Subject: [PATCH] fix: ext4: enhance tracepoints during the folios writeback + (v6.17) See upstream commits:
@@ -38,7 +38,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 34 insertions(+) diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h -index 75f92b31..fa5de84d 100644 +index 75f92b3..fa5de84 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -242,6 +242,39 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
@@ -89,6 +89,3 @@ index 75f92b31..fa5de84d 100644 LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent, TP_PROTO(struct inode *inode, struct ext4_map_blocks *map), --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch +3 -6
@@ -1,7 +1,7 @@ -From e80f709c4665a333da82b27605c26a3afccb299f Mon Sep 17 00:00:00 2001 +From 22078c50f8093b80741e080e17a3196fe074884c Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 16:01:09 -0400 -Subject: [PATCH 8/8] fix: ext4: widen trace event i_ino fields to u64 (v7.1) +Subject: [PATCH] fix: ext4: widen trace event i_ino fields to u64 (v7.1) See upstream commit:
@@ -24,7 +24,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 1048 insertions(+), 75 deletions(-) diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h -index fa5de84d..43b93cde 100644 +index fa5de84..43b93cd 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -26,6 +26,95 @@ struct ext4_extent;
@@ -1419,6 +1419,3 @@ index fa5de84d..43b93cde 100644 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0)) LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan, --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch +3 -6
@@ -1,7 +1,7 @@ -From a74f94be254e5a9856655c982dbca44b86437897 Mon Sep 17 00:00:00 2001 +From faf9b9d9584ef6615243dc123f7c14ab01b0e7c3 Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 10:54:27 -0400 -Subject: [PATCH 2/8] fix: hrtimer: Drop unnecessary pointer indirection in +Subject: [PATCH] fix: hrtimer: Drop unnecessary pointer indirection in hrtimer_expire_entry event (v7.1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
@@ -29,7 +29,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 24 insertions(+) diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h -index dfc295e0..c4a94605 100644 +index dfc295e..c4a9460 100644 --- a/include/instrumentation/events/timer.h +++ b/include/instrumentation/events/timer.h @@ -299,6 +299,29 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
@@ -70,6 +70,3 @@ index dfc295e0..c4a94605 100644 LTTNG_TRACEPOINT_EVENT_CLASS(timer_hrtimer_class, --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch +3 -7
@@ -1,8 +1,7 @@ -From 531c6e02c5a231f153d12ff628ecb677b7c2f7b9 Mon Sep 17 00:00:00 2001 +From 82000f32ec1c54a83e95ce10aefedfd6c41ec4bd Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 10:38:18 -0400 -Subject: [PATCH 1/8] fix: hrtimer: Reduce trace noise in hrtimer_start() - (v7.1) +Subject: [PATCH] fix: hrtimer: Reduce trace noise in hrtimer_start() (v7.1) See upstream commit:
@@ -38,7 +37,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h -index f69e069b..dfc295e0 100644 +index f69e069..dfc295e 100644 --- a/include/instrumentation/events/timer.h +++ b/include/instrumentation/events/timer.h @@ -220,12 +220,43 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init,
@@ -98,6 +97,3 @@ index f69e069b..dfc295e0 100644 LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, timer_hrtimer_start, --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch +3 -6
@@ -1,7 +1,7 @@ -From b9d853f90111cf657762c3e23110ab9f7a66e1aa Mon Sep 17 00:00:00 2001 +From 62aa0b4bba7e3b0c60f0bcdb5c98c77bedcd45ba Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 11:36:32 -0400 -Subject: [PATCH 3/8] fix: mm/vmscan: Convert pageout() to take a folio (v5.18) +Subject: [PATCH] fix: mm/vmscan: Convert pageout() to take a folio (v5.18) See upstream commit:
@@ -24,7 +24,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/instrumentation/events/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h -index 15d56b38..f33bcbd2 100644 +index 15d56b3..f33bcbd 100644 --- a/include/instrumentation/events/mm_vmscan.h +++ b/include/instrumentation/events/mm_vmscan.h @@ -510,7 +510,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
@@ -49,6 +49,3 @@ index 15d56b38..f33bcbd2 100644 LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_PROTO(struct page *page), --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints-v7.1.patch +3 -7
@@ -1,8 +1,7 @@ -From 0d2ee7c9cb79a880c440153beeacd736d1b61a31 Mon Sep 17 00:00:00 2001 +From c3dac15e9e2be4ab818b59a74fda26466cc16c2c Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 11:30:54 -0400 -Subject: [PATCH 4/8] fix: mm: vmscan: add cgroup IDs to vmscan tracepoints - (v7.1) +Subject: [PATCH] fix: mm: vmscan: add cgroup IDs to vmscan tracepoints (v7.1) See upstream commit:
@@ -29,7 +28,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 123 insertions(+), 2 deletions(-) diff --git a/include/instrumentation/events/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h -index f33bcbd2..cce06198 100644 +index f33bcbd..cce0619 100644 --- a/include/instrumentation/events/mm_vmscan.h +++ b/include/instrumentation/events/mm_vmscan.h @@ -121,7 +121,43 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
@@ -193,6 +192,3 @@ index f33bcbd2..cce06198 100644 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) || \ LTTNG_RHEL_KERNEL_RANGE(5,14,0,427,16,1, 5,15,0,0,0,0)) --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-treewide-change-inode-i_ino-from-unsigned-long-to-u64-v7.1.patch +4 -7
@@ -1,8 +1,8 @@ -From 0ae8e932cc2c431bafe390a43feb29b0c6a98ab5 Mon Sep 17 00:00:00 2001 +From 69ee47280a495540d91718442a66af18362a4a26 Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 14:52:02 -0400 -Subject: [PATCH 6/8] fix: treewide: change inode->i_ino from unsigned long to - u64 (v7.1) +Subject: [PATCH] fix: treewide: change inode->i_ino from unsigned long to u64 + (v7.1) See upstream commit:
@@ -37,7 +37,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lttng-uprobes.c b/src/lttng-uprobes.c -index 39c09b8f..84edbd33 100644 +index 39c09b8..84edbd3 100644 --- a/src/lttng-uprobes.c +++ b/src/lttng-uprobes.c @@ -256,8 +256,8 @@ int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe,
@@ -51,6 +51,3 @@ index 39c09b8f..84edbd33 100644 uprobe_handler->offset); ret = -1; goto register_error; --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-vfs-widen-trace-event-i_ino-fields-to-u64-v7.1.patch +3 -6
@@ -1,7 +1,7 @@ -From 95d19f6ff3d0591afce0e5666d3d17b9192789f6 Mon Sep 17 00:00:00 2001 +From 06f95d412fd63d4bd0ba2c24243a67808931f034 Mon Sep 17 00:00:00 2001 From: Michael Jeanson <[email protected]> Date: Mon, 25 May 2026 11:37:51 -0400 -Subject: [PATCH 5/8] fix: vfs: widen trace event i_ino fields to u64 (v7.1) +Subject: [PATCH] fix: vfs: widen trace event i_ino fields to u64 (v7.1) See upstream commit:
@@ -26,7 +26,7 @@ Signed-off-by: Michael Jeanson <[email protected]> 1 file changed, 174 insertions(+), 5 deletions(-) diff --git a/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h -index f53d9d3c..cbf9a426 100644 +index f53d9d3..cbf9a42 100644 --- a/include/instrumentation/events/writeback.h +++ b/include/instrumentation/events/writeback.h @@ -35,6 +35,31 @@ static inline const char *lttng_bdi_dev_name(struct backing_dev_info *bdi)
@@ -271,6 +271,3 @@ index f53d9d3c..cbf9a426 100644 LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_single_inode_template, writeback_single_inode, TP_PROTO(struct inode *inode, struct writeback_control *wbc, --- -2.43.0 -
meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch +9 -7
@@ -1,4 +1,4 @@ -From 60d423945bd4f4c4b7bfc6f29da9231152d05690 Mon Sep 17 00:00:00 2001 +From e7d6a99119798856810f4067c7c550cae2173cef Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <[email protected]> Date: Sat, 15 May 2021 10:26:38 -0400 Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
@@ -19,11 +19,13 @@ Signed-off-by: Bruce Ashfield <[email protected]> src/Kbuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -Index: lttng-modules-2.14.0/src/Kbuild -=================================================================== ---- lttng-modules-2.14.0.orig/src/Kbuild -+++ lttng-modules-2.14.0/src/Kbuild -@@ -3,10 +3,13 @@ +diff --git a/src/Kbuild b/src/Kbuild +index f33d0d5..beef608 100644 +--- a/src/Kbuild ++++ b/src/Kbuild +@@ -1,12 +1,15 @@ + # SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) + # SPDX-FileCopyrightText: 2010-2024 EfficiOS Inc. -ifdef CONFIG_LOCALVERSION # Check if dot-config is included. +ifneq ($(CONFIG_LOCALVERSION)$(CONFIG_LOCALVERSION_AUTO),) # Check if dot-config is included.
@@ -39,7 +41,7 @@ Index: lttng-modules-2.14.0/src/Kbuild TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. lttng_check_linux_version = $(shell pwd)/include/linux/version.h -@@ -168,3 +171,5 @@ +@@ -168,3 +171,5 @@ obj-$(CONFIG_LTTNG) += tests/ obj-$(CONFIG_LTTNG_SYSCALLS_EXTRACTOR) += lttng-syscalls-extractor.o # vim:syntax=make
meta/recipes-kernel/lttng/lttng-modules_2.15.1.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb +1 -2
@@ -14,7 +14,6 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ - file://0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch \ file://0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch \ file://0001-fix-hrtimer-Drop-unnecessary-pointer-indirection-in.patch \ file://0001-fix-mm-vmscan-Convert-pageout-to-take-a-folio-v5.18.patch \
@@ -24,7 +23,7 @@ SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-w file://0001-fix-ext4-enhance-tracepoints-during-the-folios-writeback-v6.17.patch \ file://0001-fix-ext4-widen-trace-event-i_ino-fields-to-u64-v7.1.patch \ " -SRC_URI[sha256sum] = "63deefbc15d9ce7c43d858187533367b01dcb6e8469d6b69ccb757d6d3dbb0ad" +SRC_URI[sha256sum] = "4eab35edeaa84ddefa243f2f842af1482325062ee008fb511a3ff191b9aa09ac" export INSTALL_MOD_DIR = "kernel/lttng-modules"
Signature · 1 line
2.47.3
PATCH 5/15 lttng-ust: upgrade 2.14.0 -> 2.15.1
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
...0001-lttng-ust-common-link-with-liburcu-explicitly.patch | 6 +++---
...thon-lttngust-Makefile.am-Add-install-lib-to-setup.patch | 6 +++---
.../lttng/{lttng-ust_2.14.0.bb => lttng-ust_2.15.1.bb} | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-ust_2.14.0.bb => lttng-ust_2.15.1.bb} (95%)meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch +3 -3
@@ -1,4 +1,4 @@ -From 1b6bbf14de8fdfe60e446c93969e29bc2cf5f2dc Mon Sep 17 00:00:00 2001 +From 182cb1e754e861a4eff4bde3919bc32462e3072c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sun, 5 Sep 2021 10:44:19 +0200 Subject: [PATCH] lttng-ust-common: link with liburcu explicitly
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+) diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am -index 1ccc290..6531fa0 100644 +index c350edc..09212a7 100644 --- a/src/lib/lttng-ust-common/Makefile.am +++ b/src/lib/lttng-ust-common/Makefile.am -@@ -16,6 +16,7 @@ liblttng_ust_common_la_SOURCES = \ +@@ -18,6 +18,7 @@ liblttng_ust_common_la_SOURCES = \ liblttng_ust_common_la_LIBADD = \ $(top_builddir)/src/common/libcommon.la \
meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch +3 -3
@@ -1,4 +1,4 @@ -From 30660997d220602202d8dc7264e49095a1581947 Mon Sep 17 00:00:00 2001 +From cd2fbbf5454af7c0910549e841b5da7a1b133a89 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Tue, 20 Feb 2024 12:19:06 +0000 Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
@@ -14,10 +14,10 @@ Signed-off-by: Robert Yang <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am -index d53e21d..283901e 100644 +index 30db9fb..d46b6ee 100644 --- a/src/python-lttngust/Makefile.am +++ b/src/python-lttngust/Makefile.am -@@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp +@@ -47,7 +47,7 @@ install-exec-local: build-python-bindings.stamp if [ "$(DESTDIR)" != "" ]; then \ opts="$$opts --root=$(DESTDIR)"; \ fi; \
meta/recipes-kernel/lttng/lttng-ust_2.15.1.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.14.0.bb +1 -1
@@ -33,7 +33,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-lttng-ust-common-link-with-liburcu-explicitly.patch \ " -SRC_URI[sha256sum] = "82cdfd304bbb2b2b7d17cc951a6756b37a9f73868ec0ba7db448a0d5ca51b763" +SRC_URI[sha256sum] = "37c9b58ea7aa7bc47d6630b52ba1a48ebce095b9a196eab4ddd273d78301792d" CVE_PRODUCT = "ust"
Signature · 1 line
2.47.3
PATCH 6/15 systemtap: upgrade 5.4 -> 5.5
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
...-native_5.4.bb => systemtap-native_5.5.bb} | 0
...gure-write-a-python-location-into-th.patch | 7 +-
...ython-modules-to-correct-library-dir.patch | 2 +-
.../0001-elaborate.cxx-fix-32-bit-build.patch | 104 ------------------
...rove-reproducibility-for-c-compiling.patch | 10 +-
...staprun-address-ncurses-6.3-failures.patch | 11 +-
...-don-t-support-installing-a-non-root.patch | 17 ++-
.../systemtap/systemtap/readline.patch | 29 +++--
.../{systemtap_5.4.bb => systemtap_5.5.bb} | 0
.../systemtap/systemtap_git.inc | 3 +-
10 files changed, 39 insertions(+), 144 deletions(-)
rename meta/recipes-kernel/systemtap/{systemtap-native_5.4.bb => systemtap-native_5.5.bb} (100%)
delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-fix-32-bit-build.patch
rename meta/recipes-kernel/systemtap/{systemtap_5.4.bb => systemtap_5.5.bb} (100%)meta/recipes-kernel/systemtap/systemtap-native_5.5.bb renamed from meta/recipes-kernel/systemtap/systemtap-native_5.4.bb +0 -0
meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch +2 -5
@@ -1,4 +1,4 @@ -From ab29615ed6c2e779b472903564dc683dc1015de7 Mon Sep 17 00:00:00 2001 +From adf505ededdd25cf43111fd12a59090a8f7de856 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
@@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtrace.in b/dtrace.in -index 5e1cf8079..a24229cbc 100644 +index 73a6f22e2..870999e36 100644 --- a/dtrace.in +++ b/dtrace.in @@ -1,4 +1,4 @@
@@ -20,6 +20,3 @@ index 5e1cf8079..a24229cbc 100644 # vim: et sta sts=4 sw=4 ts=8 # This handles the systemtap equivalent of --- -2.11.0 -
meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch +1 -1
@@ -1,4 +1,4 @@ -From 7847240a97f5010ebab775f7ac51812a7705a886 Mon Sep 17 00:00:00 2001 +From a261ee9efca120b6d65310a972d91dffc00ac937 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 24 Feb 2017 17:53:02 +0200 Subject: [PATCH] Install python modules to correct library dir.
meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-fix-32-bit-build.patch deleted +0 -104
104 lines not on this page · raw message
meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +5 -5
@@ -1,4 +1,4 @@ -From 6288ba5df0a8c73ef842b609081449ac4de86123 Mon Sep 17 00:00:00 2001 +From 06522edad080caa76f5abc8586fe5baf3b620f16 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
@@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia <[email protected]> stringtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/stringtable.h -=================================================================== ---- git.orig/stringtable.h -+++ git/stringtable.h +diff --git a/stringtable.h b/stringtable.h +index aef564824..a04888f3c 100644 +--- a/stringtable.h ++++ b/stringtable.h @@ -23,7 +23,7 @@ #if 0 && defined(HAVE_BOOST_UTILITY_STRING_REF_HPP)
meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch +4 -7
@@ -1,4 +1,4 @@ -From 191f528da19193d713d94ee252e2485efd9af4d3 Mon Sep 17 00:00:00 2001 +From 7672d0e398b29a52f59a1a0cbb75d4d07bd5f975 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
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/staprun/monitor.c b/staprun/monitor.c -index 478634c09..f4fbfd686 100644 +index 851ee14c4..7d83a3846 100644 --- a/staprun/monitor.c +++ b/staprun/monitor.c -@@ -448,12 +448,12 @@ void monitor_render(void) +@@ -453,12 +453,12 @@ void monitor_render(void) if (active_window == 0) wattron(status, A_BOLD); wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n",
@@ -32,7 +32,7 @@ index 478634c09..f4fbfd686 100644 HIGHLIGHT("name", p_name, comp_fn_index)); if (active_window == 0) wattroff(status, A_BOLD); -@@ -466,17 +466,17 @@ void monitor_render(void) +@@ -471,17 +471,17 @@ void monitor_render(void) json_object *probe, *field; probe = json_object_array_get_idx(jso_probe_list, i); json_object_object_get_ex(probe, "index", &field);
@@ -56,6 +56,3 @@ index 478634c09..f4fbfd686 100644 getyx(status, discard, cur_x); json_object_object_get_ex(probe, "name", &field); wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); --- -2.20.1 -
meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch +8 -9
@@ -1,4 +1,4 @@ -From 3e13a006fe3dff9489269274093bf868532036e2 Mon Sep 17 00:00:00 2001 +From 3483d0bc400eb618add607097027eafb075722f4 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
@@ -10,15 +10,14 @@ the binaries. Upstream-Status: Inappropriate [Embedded] Signed-off-by: Saul Wold <[email protected]> --- - stapbpf/Makefile.am | 14 +++++++------- - staprun/Makefile.am | 12 ++++++------ - 2 files changed, 13 insertions(+), 13 deletions(-) + stapbpf/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) -Index: git/stapbpf/Makefile.am -=================================================================== ---- git.orig/stapbpf/Makefile.am -+++ git/stapbpf/Makefile.am -@@ -41,10 +41,10 @@ +diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am +index 4bd116bc3..e06d0801b 100644 +--- a/stapbpf/Makefile.am ++++ b/stapbpf/Makefile.am +@@ -40,10 +40,10 @@ git_version.stamp ../git_version.h: # Why the "id -u" condition? This way, an unprivileged user can run # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later.
meta/recipes-kernel/systemtap/systemtap/readline.patch +18 -11
@@ -1,4 +1,7 @@ -configure: add option to enable/disable readline +From ee20cb1c1ca0337c56087934efbd66ba30d2d5c3 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 Add an option to control explicitly whether systemtap will look for and use readline, for reproducible builds.
@@ -10,11 +13,14 @@ not be used. Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2026q2/028333.html] Signed-off-by: Ross Burton <[email protected]> +--- + configure.ac | 67 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 38 insertions(+), 29 deletions(-) -diff --git i/configure.ac w/configure.ac -index 6fb99da40..01457bafb 100644 ---- i/configure.ac -+++ w/configure.ac +diff --git a/configure.ac b/configure.ac +index 6fb99da40..2ec72e85a 100644 +--- a/configure.ac ++++ b/configure.ac @@ -525,38 +525,47 @@ AC_CHECK_HEADERS([rpm/rpmcrypto.h], [ have_rpmcrypto_h=yes AC_MSG_NOTICE([separate rpm/rpmcrypto.h])])
@@ -23,7 +29,7 @@ index 6fb99da40..01457bafb 100644 -dnl -dnl First save the orignal value of LIBS. -LIBS_no_readline=$LIBS - +- -dnl Check how for readline presence and how to link with it. On some -dnl systems you need to add a termcap compatible library. -have_libreadline="no"
@@ -31,6 +37,7 @@ index 6fb99da40..01457bafb 100644 -for libtermcap in "" tinfo ncursesw ncurses curses termcap; do - if test -z "$libtermcap"; then - READLINE_LIBS="-lreadline" ++ +AC_ARG_WITH([readline], + AS_HELP_STRING([--without-readline],[disable use of readline]), [], [with_readline="check"]) +
@@ -66,17 +73,17 @@ index 6fb99da40..01457bafb 100644 + READLINE_LIBS="" else - READLINE_LIBS="-lreadline -l$libtermcap" -+ AC_MSG_RESULT([$READLINE_LIBS]) -+ AC_DEFINE(HAVE_LIBREADLINE, [1], -+ [Define if you have the readline library (-lreadline).]) - fi +- fi - LIBS="$READLINE_LIBS $LIBS_no_readline" - AC_LINK_IFELSE( - [AC_LANG_CALL([],[readline])], - [have_libreadline="yes"]) - if test "$have_libreadline" = "yes"; then - break -- fi ++ AC_MSG_RESULT([$READLINE_LIBS]) ++ AC_DEFINE(HAVE_LIBREADLINE, [1], ++ [Define if you have the readline library (-lreadline).]) + fi -done -if test "$have_libreadline" = "no"; then - AC_MSG_RESULT([none])
meta/recipes-kernel/systemtap/systemtap_5.5.bb renamed from meta/recipes-kernel/systemtap/systemtap_5.4.bb +0 -0
meta/recipes-kernel/systemtap/systemtap_git.inc +1 -2
@@ -5,11 +5,10 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;t file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ - file://0001-elaborate.cxx-fix-32-bit-build.patch \ file://readline.patch \ " -SRCREV = "911a1354aac264651fda932061e7f20d2ecc2471" +SRCREV = "90b164cf106ef16f873ab58c8c6f653718bb6e17" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux' COMPATIBLE_HOST:libc-musl = 'null'
Signature · 1 line
2.47.3
Re: [OE-core] [PATCH 06/15] systemtap: upgrade 5.4 -> 5.5
Quoted 4 lines · Alexander Kanavin via lists.openembedded.org
From: Alexander Kanavin <[email protected]>
Signed-off-by Alexander Kanavin <[email protected]>---
Hi Alex,
Thanks for the upgrade.
It looks like we got some reproducibility issue with this one:
AssertionError: The following deb packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/systemtap-locale-pl_5.5-r0_amd64.deb The following ipk packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./x86-64-v3/systemtap-locale-pl_5.5-r0_x86-64-v3.ipk
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4217
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4219
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4220
It looks like systemtap.mo is a bit bigger:
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260621-447krk67/packages/diff-html/
Can you have a look at the issue?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 7/15 inetutils: upgrade 2.7 -> 2.8
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
All dropped patches are backports.
Add warnings disabling as upstream does something custom that clashes with oe's flags:
| cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
---
.../inetutils/CVE-2026-24061-01.patch | 38 -----
.../inetutils/CVE-2026-24061-02.patch | 82 -----------
.../inetutils/inetutils/CVE-2026-28372.patch | 86 -----------
.../inetutils/inetutils/CVE-2026-32746.patch | 55 -------
.../inetutils/inetutils/CVE-2026-32772.patch | 138 ------------------
.../{inetutils_2.7.bb => inetutils_2.8.bb} | 8 +-
6 files changed, 2 insertions(+), 405 deletions(-)
delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-01.patch
delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-02.patch
delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-28372.patch
delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32746.patch
delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32772.patch
rename meta/recipes-connectivity/inetutils/{inetutils_2.7.bb => inetutils_2.8.bb} (96%)meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-01.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From fd702c02497b2f398e739e3119bed0b23dd7aa7b Mon Sep 17 00:00:00 2001 -From: Paul Eggert <[email protected]> -Date: Tue, 20 Jan 2026 01:10:36 -0800 -Subject: [PATCH] Fix injection bug with bogus user names - -Problem reported by Kyu Neushwaistein. -* telnetd/utility.c (_var_short_name): -Ignore user names that start with '-' or contain shell metacharacters. - -Signed-off-by: Simon Josefsson <[email protected]> - -CVE: CVE-2026-24061 -Upstream-Status: Backport [https://codeberg.org/inetutils/inetutils/commit/fd702c02497b2f398e739e3119bed0b23dd7aa7b] -Signed-off-by: Peter Marko <[email protected]> ---- - telnetd/utility.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/telnetd/utility.c b/telnetd/utility.c -index b486226e..c02cd0e6 100644 ---- a/telnetd/utility.c -+++ b/telnetd/utility.c -@@ -1733,7 +1733,14 @@ _var_short_name (struct line_expander *exp) - return user_name ? xstrdup (user_name) : NULL; - - case 'U': -- return getenv ("USER") ? xstrdup (getenv ("USER")) : xstrdup (""); -+ { -+ /* Ignore user names starting with '-' or containing shell -+ metachars, as they can cause trouble. */ -+ char const *u = getenv ("USER"); -+ return xstrdup ((u && *u != '-' -+ && !u[strcspn (u, "\t\n !\"#$&'()*;<=>?[\\^`{|}~")]) -+ ? u : ""); -+ } - - default: - exp->state = EXP_STATE_ERROR;
meta/recipes-connectivity/inetutils/inetutils/CVE-2026-24061-02.patch deleted +0 -82
82 lines not on this page · raw message
meta/recipes-connectivity/inetutils/inetutils/CVE-2026-28372.patch deleted +0 -86
86 lines not on this page · raw message
meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32746.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-connectivity/inetutils/inetutils/CVE-2026-32772.patch deleted +0 -138
138 lines not on this page · raw message
meta/recipes-connectivity/inetutils/inetutils_2.8.bb renamed from meta/recipes-connectivity/inetutils/inetutils_2.7.bb +2 -6
@@ -11,18 +11,13 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI[sha256sum] = "a156be1cde3c5c0ffefc262180d9369a60484087907aa554c62787d2f40ec086" +SRC_URI[sha256sum] = "57b3cf4f77555992881e5ba2a09a63b05aa2c56342a60ed4305b5f45938390b5" SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ file://rexec.xinetd.inetutils \ file://rlogin.xinetd.inetutils \ file://rsh.xinetd.inetutils \ file://telnet.xinetd.inetutils \ file://tftpd.xinetd.inetutils \ - file://CVE-2026-24061-01.patch \ - file://CVE-2026-24061-02.patch \ - file://CVE-2026-28372.patch \ - file://CVE-2026-32746.patch \ - file://CVE-2026-32772.patch \ " inherit autotools gettext update-alternatives texinfo
@@ -44,6 +39,7 @@ EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ --with-path-cp=${base_bindir}/cp \ --with-path-uucico=${libexecdir}/uuico \ --with-path-procnet-dev=/proc/net/dev \ + --enable-gcc-warnings=no \ " EXTRA_OECONF:append:libc-musl = " --with-path-utmpx=/dev/null/utmpx --with-path-wtmpx=/dev/null/wtmpx"
Signature · 1 line
2.47.3
PATCH 8/15 debugedit: upgrade 5.2 -> 5.3
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../{debugedit_5.2.bb => debugedit_5.3.bb} | 3 +-
...not-check-for-executables-needed-onl.patch | 63 +++++++++++++++++++
...003-Makefile.am-do-not-update-manual.patch | 22 ++++---
3 files changed, 80 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/debugedit/{debugedit_5.2.bb => debugedit_5.3.bb} (86%)
create mode 100644 meta/recipes-devtools/debugedit/files/0001-configure.ac-do-not-check-for-executables-needed-onl.patchmeta/recipes-devtools/debugedit/debugedit_5.3.bb renamed from meta/recipes-devtools/debugedit/debugedit_5.2.bb +2 -1
@@ -11,9 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "https://sourceware.org/ftp/debugedit/${PV}/debugedit-${PV}.tar.xz \ file://0003-Makefile.am-do-not-update-manual.patch \ + file://0001-configure.ac-do-not-check-for-executables-needed-onl.patch \ " -SRC_URI[sha256sum] = "705296803cc4403f38764e891b4ed38f8d8d4f8a9164bd4f86c9d4bedcac68dd" +SRC_URI[sha256sum] = "3b8c6396fe235e0270c9b9c0d244cfd0e86c284fc27e820acc58360e7cfa08c2" DEPENDS = "elfutils xxhash" DEPENDS:append:libc-musl = " musl-legacy-error"
meta/recipes-devtools/debugedit/files/0001-configure.ac-do-not-check-for-executables-needed-onl.patch new file +63 -0
63 lines not on this page · raw message
meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch +15 -7
@@ -1,4 +1,4 @@ -From b2715c3f4d28fab1c238086d9b5435e269b06301 Mon Sep 17 00:00:00 2001 +From f9e6f9cadedc94323e8878e60aaa684be7c52d97 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 23 Mar 2023 13:09:23 +0800 Subject: [PATCH] Makefile.am: do not update manual
@@ -16,16 +16,16 @@ Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi <[email protected]> --- - Makefile.am | 30 ------------------------------ - 1 file changed, 30 deletions(-) + Makefile.am | 38 -------------------------------------- + 1 file changed, 38 deletions(-) diff --git a/Makefile.am b/Makefile.am -index c590edf..692e016 100644 +index d3068d5..f218a05 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -52,36 +52,6 @@ sepdebugcrcfix_LDADD = @LIBELF_LIBS@ - # Manual pages are generated for dist - dist_man_MANS = debugedit.1 sepdebugcrcfix.1 find-debuginfo.1 +@@ -60,44 +60,6 @@ debugedit_classify_ar_LDADD = @LIBELF_LIBS@ + dist_man_MANS = debugedit.1 sepdebugcrcfix.1 find-debuginfo.1 \ + debugedit-classify-ar.1 -# The 'case' ensures the man pages are only generated if the corresponding -# source script (the first prerequisite) or configure.ac (for the version)
@@ -49,6 +49,14 @@ index c590edf..692e016 100644 - * ) : ;; \ - esac - +-debugedit-classify-ar.1: tools/debugedit-classify-ar.c configure.ac debugedit-classify-ar$(EXEEXT) +- @case '$?' in \ +- *$<* | *configure.ac* ) $(HELP2MAN) -N --output=$@ \ +- --name='Checks whether ELF archive members should be processed' \ +- ./debugedit-classify-ar$(EXEEXT) ;;\ +- * ) : ;; \ +- esac +- -find-debuginfo.1: $(top_srcdir)/scripts/find-debuginfo.in configure.ac find-debuginfo - @case '$?' in \ - *$<* | *configure.ac* ) $(HELP2MAN) -N --output=$@ \
Signature · 1 line
2.47.3
PATCH 9/15 elfutils: upgrade 0.194 -> 0.195
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../{elfutils_0.194.bb => elfutils_0.195.bb} | 3 +-
...001-config-eu.am-do-not-force-Werror.patch | 12 ++--
...u-objects-to-libelf.a-static-archive.patch | 6 +-
...-check-data_list.data.d.d_buf-before.patch | 6 +-
...-skip-the-test-when-gcc-not-deployed.patch | 2 +-
...m-compile-test_nlist-with-standard-C.patch | 6 +-
...cvt_gunhash-if-dest-and-src-are-same.patch | 8 +--
.../elfutils/files/0003-fixheadercheck.patch | 6 +-
.../elfutils/files/0003-musl-utils.patch | 6 +-
...h64-Recognize-SHT_AARCH64_ATTRIBUTES.patch | 60 -------------------
.../elfutils/files/ptest.patch | 14 ++---
11 files changed, 34 insertions(+), 95 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils_0.194.bb => elfutils_0.195.bb} (98%)
delete mode 100644 meta/recipes-devtools/elfutils/files/0004-aarch64-Recognize-SHT_AARCH64_ATTRIBUTES.patchmeta/recipes-devtools/elfutils/elfutils_0.195.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.194.bb +1 -2
@@ -20,12 +20,11 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ file://0001-config-eu.am-do-not-force-Werror.patch \ file://0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch \ - file://0004-aarch64-Recognize-SHT_AARCH64_ATTRIBUTES.patch \ " SRC_URI:append:libc-musl = " \ file://0003-musl-utils.patch \ " -SRC_URI[sha256sum] = "09e2ff033d39baa8b388a2d7fbc5390bfde99ae3b7c67c7daaf7433fbcf0f01e" +SRC_URI[sha256sum] = "37629fdf7f1f3dc2818e138fca2b8094177d6c2d0f701d3bb650a561218dc026" inherit autotools gettext ptest pkgconfig
meta/recipes-devtools/elfutils/files/0001-config-eu.am-do-not-force-Werror.patch +6 -6
@@ -1,4 +1,4 @@ -From e169c3fc734be1783b3e1a4768dbec05fb64cb4f Mon Sep 17 00:00:00 2001 +From 5a82f181583e02e19ed739a195801032532474bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 22 Nov 2024 12:50:48 +0100 Subject: [PATCH] config/eu.am: do not force -Werror
@@ -13,18 +13,18 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 deletions(-) diff --git a/config/eu.am b/config/eu.am -index 0b7dab5..5e7a03f 100644 +index 321591f..a1748a8 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ +@@ -135,7 +135,6 @@ AM_CFLAGS = -Wall -Wshadow -Wformat=2 \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ - $(USE_AFTER_FREE3_WARNING) \ + $(USE_AFTER_FREE3_WARNING) $(MISSING_PARAMETER_NAME_WARNING) \ + $(DEPRECATED_NON_PROTOTYPE_WARNING) $(FREE_LABELS_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -@@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ +@@ -145,7 +144,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ $(TRAMPOLINES_WARNING) \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
meta/recipes-devtools/elfutils/files/0001-libelf-Add-libeu-objects-to-libelf.a-static-archive.patch +3 -3
@@ -1,4 +1,4 @@ -From f5d6e088f84dd05278c4698a21cbf1ff4569978d Mon Sep 17 00:00:00 2001 +From ad94a59ebcc32f71853716aff650997076d112df Mon Sep 17 00:00:00 2001 From: Mark Wielaard <[email protected]> Date: Tue, 22 Oct 2024 15:03:42 +0200 Subject: [PATCH] libelf: Add libeu objects to libelf.a static archive
@@ -20,10 +20,10 @@ Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h 1 file changed, 3 insertions(+) diff --git a/libelf/Makefile.am b/libelf/Makefile.am -index 05484c1..72f1e22 100644 +index cc539c8..156a486 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am -@@ -125,6 +125,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) +@@ -126,6 +126,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) libeu_objects = $(shell cat ../lib/libeu.manifest) libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects))
meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch +3 -3
@@ -1,4 +1,4 @@ -From c4a26ff38182b289a1076bbef263e808b5e3aa97 Mon Sep 17 00:00:00 2001 +From 6b339ad9f9084b653b0d0c3823c871a7a9774b63 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 16 Aug 2018 09:58:26 +0800 Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it
@@ -19,10 +19,10 @@ Signed-off-by: Robert Yang <[email protected]> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libelf/elf_end.c b/libelf/elf_end.c -index da8f3a2..8557658 100644 +index 9df2e16..339d7ed 100644 --- a/libelf/elf_end.c +++ b/libelf/elf_end.c -@@ -170,14 +170,16 @@ elf_end (Elf *elf) +@@ -176,14 +176,16 @@ elf_end (Elf *elf) architecture doesn't require overly stringent alignment the raw data buffer is the same as the one used for presenting to the caller. */
meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch +1 -1
@@ -1,4 +1,4 @@ -From d59d6fd13e4a7fe3fdca2a4ce1cd2def36356bb4 Mon Sep 17 00:00:00 2001 +From 168f8b6e37a762a6263c279d95fee9346e1f44ca Mon Sep 17 00:00:00 2001 From: Mingli Yu <[email protected]> Date: Tue, 21 May 2019 15:20:34 +0800 Subject: [PATCH] skip the test when gcc not deployed
meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch +3 -3
@@ -1,4 +1,4 @@ -From 34ae914b362c84ff0a96b8936beedb44a2e3f451 Mon Sep 17 00:00:00 2001 +From 7355ed2e9d0e1f38ab87f115011ab498388b4a41 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 23 Jun 2020 07:49:35 +0000 Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index eed9bd4..5dd6e05 100644 +index 946c7d2e..32590f6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -104,7 +104,7 @@ endif +@@ -118,7 +118,7 @@ endif test-nlist$(EXEEXT): test-nlist.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) \
meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch +4 -4
@@ -1,4 +1,4 @@ -From bd78783254a7126d82eab26a2069b3a457b98e2e Mon Sep 17 00:00:00 2001 +From ad1bf27f823db8a48e1e64ecce2e6998e990dc41 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 15 Aug 2017 17:13:59 +0800 Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same.
@@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h -index 3a00ae0..40468fc 100644 +index cf9d4b5..f518ce2 100644 --- a/libelf/gnuhash_xlate.h +++ b/libelf/gnuhash_xlate.h -@@ -42,6 +42,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) +@@ -41,6 +41,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) words. We must detangle them here. */ Elf32_Word *dest32 = dest; const Elf32_Word *src32 = src;
@@ -28,7 +28,7 @@ index 3a00ae0..40468fc 100644 /* First four control words, 32 bits. */ for (unsigned int cnt = 0; cnt < 4; ++cnt) -@@ -52,7 +53,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) +@@ -51,7 +52,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) len -= 4; }
meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch +3 -3
@@ -1,4 +1,4 @@ -From da61b483072b7b0bfac1f034ad03972f5104a410 Mon Sep 17 00:00:00 2001 +From 7b48ae456de3e2f2a94f91c800b238788d5fd277 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 15 Aug 2017 17:17:20 +0800 Subject: [PATCH] fixheadercheck
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c -index 3594e8b..a3314e5 100644 +index 57239ee..3a640bd 100644 --- a/libelf/elf32_updatenull.c +++ b/libelf/elf32_updatenull.c -@@ -355,8 +355,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) +@@ -360,8 +360,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) we test for the alignment of the section being large enough for the largest alignment required by a data block. */
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +3 -3
@@ -1,4 +1,4 @@ -From b1c956cd739f364c4a80381578ddaba43e36903b Mon Sep 17 00:00:00 2001 +From efa2836719b669c3200a615898627f6b6a4dd570 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils
@@ -56,7 +56,7 @@ index f771b92..263de62 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/strip.c b/src/strip.c -index 403e0f6..738e948 100644 +index 20cc8a2..2ce52e8 100644 --- a/src/strip.c +++ b/src/strip.c @@ -45,6 +45,13 @@
@@ -74,7 +74,7 @@ index 403e0f6..738e948 100644 /* Name and version of program. */ diff --git a/src/unstrip.c b/src/unstrip.c -index d70053d..b8a6ff3 100644 +index 5585b0e..adc39a3 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -51,6 +51,15 @@
meta/recipes-devtools/elfutils/files/0004-aarch64-Recognize-SHT_AARCH64_ATTRIBUTES.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/ptest.patch +7 -7
@@ -1,4 +1,4 @@ -From 74dad3295f2b8dc06b7e6bb876bc4541e927ef47 Mon Sep 17 00:00:00 2001 +From eeafa586990429f440eb2dbd9b4231edff6ae904 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 1 May 2019 16:37:48 +0100 Subject: [PATCH] Changes to allow ptest to run standalone on target:
@@ -21,10 +21,10 @@ Upstream-Status: Inappropriate [oe specific] 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 0670e01..14f3e36 100644 +index 80c7fd8..3e31485 100644 --- a/configure.ac +++ b/configure.ac -@@ -43,7 +43,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2025 The elfutils developers.]) +@@ -43,7 +43,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2026 The elfutils developers.]) AC_PREREQ(2.69) dnl Minimum Autoconf version required. dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
@@ -34,20 +34,20 @@ index 0670e01..14f3e36 100644 AM_SILENT_RULES([yes]) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 00ba754..6be7dd6 100644 +index 9a00541..946c7d2e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -937,3 +937,5 @@ check: check-am coverage +@@ -943,3 +943,5 @@ check: check-am coverage coverage: -$(srcdir)/coverage.sh endif +oecheck: + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) diff --git a/tests/test-subr.sh b/tests/test-subr.sh -index ea80cbe..7632d20 100644 +index 623b5b7..5bac66c 100644 --- a/tests/test-subr.sh +++ b/tests/test-subr.sh -@@ -92,12 +92,6 @@ installed_testrun() +@@ -95,12 +95,6 @@ installed_testrun() program="$1" shift case "$program" in
Signature · 1 line
2.47.3
PATCH 10/15 libsolv: upgrade 0.7.37 -> 0.7.39
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop a patch as upstream solved the issue separately by moving the data to the heap.
---
...0001-compress_buf-fix-musl-segfaults.patch | 41 -------------------
.../{libsolv_0.7.37.bb => libsolv_0.7.39.bb} | 3 +-
2 files changed, 1 insertion(+), 43 deletions(-)
delete mode 100644 meta/recipes-extended/libsolv/libsolv/0001-compress_buf-fix-musl-segfaults.patch
rename meta/recipes-extended/libsolv/{libsolv_0.7.37.bb => libsolv_0.7.39.bb} (92%)meta/recipes-extended/libsolv/libsolv/0001-compress_buf-fix-musl-segfaults.patch deleted +0 -41
@@ -1,41 +0,0 @@ -From 847fb663583fd01121313d1ec0e9ceab240c9143 Mon Sep 17 00:00:00 2001 -From: Adam Duskett <[email protected]> -Date: Thu, 26 Mar 2026 12:11:42 +0100 -Subject: [PATCH] compress_buf: fix musl segfaults - -By default, musl has a stack size of 128K, while the compress_buf -method uses 256KB of stack space! - -The easiest course of action is to add `static thread_local` -to htab and hnext. - -Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/612] - -Signed-off-by: Adam Duskett <[email protected]> ---- - src/repopage.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/repopage.c b/src/repopage.c -index 77c7fcc7..470e4f34 100644 ---- a/src/repopage.c -+++ b/src/repopage.c -@@ -29,6 +29,7 @@ - #include <assert.h> - #include <fcntl.h> - #include <time.h> -+#include <threads.h> - - #ifdef _WIN32 - #include <windows.h> -@@ -100,8 +101,8 @@ compress_buf(const unsigned char *in, unsigned int in_len, - unsigned int oo = 0; /* out-offset */ - unsigned int io = 0; /* in-offset */ - #define HS (65536) -- Ref htab[HS]; -- Ref hnext[BLOCK_SIZE]; -+ static thread_local Ref htab[HS]; -+ static thread_local Ref hnext[BLOCK_SIZE]; - unsigned int litofs = 0; - memset(htab, -1, sizeof (htab)); - memset(hnext, -1, sizeof (hnext));
meta/recipes-extended/libsolv/libsolv_0.7.39.bb renamed from meta/recipes-extended/libsolv/libsolv_0.7.37.bb +1 -2
@@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib zstd" SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https;tag=${PV} \ - file://0001-compress_buf-fix-musl-segfaults.patch \ file://run-ptest \ " -SRCREV = "806c0513cd0799a37802f483710cfbdcc6d16b5f" +SRCREV = "2f58c6f86edd978d6bdbd87dce9c85388e9b9dcc" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.47.3
PATCH 11/15 man-pages: upgrade 6.17 -> 6.18
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
License-Update: formatting
---
.../man-pages/{man-pages_6.17.bb => man-pages_6.18.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/man-pages/{man-pages_6.17.bb => man-pages_6.18.bb} (92%)meta/recipes-extended/man-pages/man-pages_6.18.bb renamed from meta/recipes-extended/man-pages/man-pages_6.17.bb +2 -2
@@ -4,7 +4,7 @@ SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT" -LIC_FILES_CHKSUM = "file://README;md5=c2d6fa1a74bdd79c25de6f4db7332294 \ +LIC_FILES_CHKSUM = "file://README;md5=e4d3c4124726a2b7763489612768c03c \ file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \ file://LICENSES/BSD-3-Clause.txt;md5=407426fcc1a243b7b2eff6e35c56aca9 \ file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://README;md5=c2d6fa1a74bdd79c25de6f4db7332294 \ SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "ca29e4d1f1edce2e27719967e9c4c2506c5501d0567d55bb723e10ec57a6ed14" +SRC_URI[sha256sum] = "09f975373336a7b44fc1770176f3d2238a111c34e24812ad3b63ec3328795c01" inherit manpages lib_package
Signature · 1 line
2.47.3
PATCH 12/15 parted: upgrade 3.6 -> 3.7
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop three patches, as they're either obsolete, or merged upstream.
---
...CH-parted-fix-do_version-declaration.patch | 40 -------------------
...o-linker-flags-for-libparted-fs-resi.patch | 34 ----------------
.../parted/files/autoconf-2.73.patch | 22 ----------
.../parted/files/fix-doc-mandir.patch | 14 ++++++-
.../parted/{parted_3.6.bb => parted_3.7.bb} | 5 +--
5 files changed, 13 insertions(+), 102 deletions(-)
delete mode 100644 meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
delete mode 100644 meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch
delete mode 100644 meta/recipes-extended/parted/files/autoconf-2.73.patch
rename meta/recipes-extended/parted/{parted_3.6.bb => parted_3.7.bb} (88%)meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From eb6bb2e8dfc78ca1a187d07ea29b23a805c61794 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <[email protected]> -Date: Wed, 20 Nov 2024 12:22:22 +0000 -Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration - -With gcc 15-20241117 compile fails with the below error, update the -do_version declaration to match the header in command.h - -../../parted/parted.c: In function '_init_commands': -../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types] - 2469 | do_version, - | ^~~~~~~~~~ - | | - | int (*)(void) -In file included from ../../parted/parted.c:28: -../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)' - 35 | int (*method) (PedDevice** dev, PedDisk** diskp), - | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271] -Signed-off-by: Rudi Heitbaum <[email protected]> -Signed-off-by: Brian C. Lane <[email protected]> -Signed-off-by: Khem Raj <[email protected]> ---- - parted/parted.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parted/parted.c b/parted/parted.c -index 3abb52f..fc2aeba 100644 ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp) - } - - static int --do_version () -+do_version (PedDevice** dev, PedDisk** diskp) - { - printf ("\n%s\n%s", - prog_name,
meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 1fc88332f7e906294fd889287b9e84cefc7f1586 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 12 Jun 2023 10:40:07 -0700 -Subject: [PATCH] fs: Add libuuid to linker flags for libparted-fs-resize - library - -This library uses uuid_generate function which comes from libuuid and -hence it should be mentioned on linker cmdline - -fixes -| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate -| >>> referenced by /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/fatresize/1.1.0-r0/recipe-sysroot/usr/lib/libparted-fs-resize.so - -Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2023-June/005873.html] -Signed-off-by: Khem Raj <[email protected]> ---- - libparted/fs/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am -index 2f345f3..a8970eb 100644 ---- a/libparted/fs/Makefile.am -+++ b/libparted/fs/Makefile.am -@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \ - EXTRA_DIST += fsresize.sym - libparted_fs_resize_la_DEPENDENCIES = $(sym_file) - -+libparted_fs_resize_la_LIBADD = $(UUID_LIBS) - libparted_fs_resize_la_SOURCES = \ - r/filesys.c \ - r/fat/bootsector.c \ --- -2.41.0 -
meta/recipes-extended/parted/files/autoconf-2.73.patch deleted +0 -22
@@ -1,22 +0,0 @@ -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather -than the full code: - -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb - -Just tweak the exiting code to work with 2.73. The next parted upgrade should -update to new gnulib - -Upstream-Status: Inappropriate -Signed-off-by: Richard Purdie <[email protected]> - ---- a/m4/largefile.m4 -+++ b/m4/largefile.m4 -@@ -27,7 +27,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # Work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # -------------------------------
meta/recipes-extended/parted/files/fix-doc-mandir.patch +12 -2
@@ -1,3 +1,8 @@ +From fe0f3729a7b6396b0d9cc54897955c1af56fc9db Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter <[email protected]> +Date: Thu, 15 Mar 2012 23:17:52 +0100 +Subject: [PATCH] parted: update to version 3.1 + Upstream-Status: Submitted [[email protected]] | for po in `ls -1 ./*.pt_BR.po 2>/dev/null`; do \
@@ -6,9 +11,14 @@ Upstream-Status: Submitted [[email protected]] | Makefile:904: *** Recursive variable `mandir' references itself (eventually). Stop. Signed-off-by: Andreas Oberritter <[email protected]> +--- + doc/po4a.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- parted-3.1/doc/po4a.mk.orig 2012-03-15 14:09:11.555831872 +0100 -+++ parted-3.1/doc/po4a.mk 2012-03-15 14:10:44.243830985 +0100 +diff --git a/doc/po4a.mk b/doc/po4a.mk +index aaf4024..9c8672a 100644 +--- a/doc/po4a.mk ++++ b/doc/po4a.mk @@ -23,7 +23,7 @@ # threshold is 80%), it won't be distributed, and the build won't fail. #
meta/recipes-extended/parted/parted_3.7.bb renamed from meta/recipes-extended/parted/parted_3.6.bb +1 -4
@@ -8,13 +8,10 @@ DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-doc-mandir.patch \ - file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ - file://autoconf-2.73.patch \ - file://0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612" +SRC_URI[sha256sum] = "008de57561a4f3c25a0648e66ed11e7b30be493889b64334a6d70f2c1951ef7b" inherit autotools pkgconfig gettext texinfo ptest
Signature · 1 line
2.47.3
PATCH 13/15 librsvg: upgrade: 2.62.2 -> 2.62.3
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop patch merged upstream.
---
meta/recipes-gnome/librsvg/librsvg-crates.inc | 8 +-
...append-RUSTFLAGS-to-rustc-executable.patch | 2 +-
...e-care-of-deprecated-assert_cmd-Comm.patch | 2 +-
.../librsvg/librsvg/cross-query-loaders.patch | 169 ------------------
.../{librsvg_2.62.2.bb => librsvg_2.62.3.bb} | 3 +-
5 files changed, 7 insertions(+), 177 deletions(-)
delete mode 100644 meta/recipes-gnome/librsvg/librsvg/cross-query-loaders.patch
rename meta/recipes-gnome/librsvg/{librsvg_2.62.2.bb => librsvg_2.62.3.bb} (97%)meta/recipes-gnome/librsvg/librsvg-crates.inc +4 -4
@@ -235,8 +235,8 @@ SRC_URI += " \ crate://crates.io/quick-error/2.0.1 \ crate://crates.io/quote/1.0.44 \ crate://crates.io/r-efi/5.3.0 \ - crate://crates.io/rand/0.8.5 \ - crate://crates.io/rand/0.9.2 \ + crate://crates.io/rand/0.8.6 \ + crate://crates.io/rand/0.9.4 \ crate://crates.io/rand_chacha/0.9.0 \ crate://crates.io/rand_core/0.6.4 \ crate://crates.io/rand_core/0.9.5 \
@@ -589,8 +589,8 @@ SRC_URI[quick-error-1.2.3.sha256sum] = "a1d01941d82fa2ab50be1e79e6714289dd7cde78 SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +SRC_URI[rand-0.8.6.sha256sum] = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +SRC_URI[rand-0.9.4.sha256sum] = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
meta/recipes-gnome/librsvg/librsvg/0001-query-rustc-append-RUSTFLAGS-to-rustc-executable.patch +1 -1
@@ -1,4 +1,4 @@ -From e89982e61e50c7d25d563f2fa0481f9bba481f04 Mon Sep 17 00:00:00 2001 +From 2becfbb5964754f7c3f1ff90f9447d84093ba986 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari <[email protected]> Date: Sat, 2 Aug 2025 20:57:49 +0200 Subject: [PATCH] query-rustc: append RUSTFLAGS to rustc executable
meta/recipes-gnome/librsvg/librsvg/0001-tests-revert-Take-care-of-deprecated-assert_cmd-Comm.patch +1 -1
@@ -1,4 +1,4 @@ -From bc089af8ce38ad268bc4283040ec28241c5064a6 Mon Sep 17 00:00:00 2001 +From 095e3c67c5e6b410098eb8d86878ec411d00fa0b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 18 Dec 2025 18:43:20 +0100 Subject: [PATCH] tests: revert 'Take care of deprecated
meta/recipes-gnome/librsvg/librsvg/cross-query-loaders.patch deleted +0 -169
169 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg_2.62.3.bb renamed from meta/recipes-gnome/librsvg/librsvg_2.62.2.bb +1 -2
@@ -25,9 +25,8 @@ require ${BPN}-crates.inc SRC_URI += "file://0001-query-rustc-append-RUSTFLAGS-to-rustc-executable.patch \ file://0001-tests-revert-Take-care-of-deprecated-assert_cmd-Comm.patch \ - file://cross-query-loaders.patch \ file://run-ptest" -SRC_URI[archive.sha256sum] = "c0c1367e381e1ae4842a78f1b57c656ff19b25637e3a6527cb44ae5a1cc68d65" +SRC_URI[archive.sha256sum] = "7eb449b2722a768021356f66dfee3202c229b54ed4e6a70ce40c090e97ff16f2" UPSTREAM_CHECK_REGEX = "librsvg-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.47.3
PATCH 14/15 vte: upgrade 0.82.2 -> 0.84.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
...rt-reproducibility-for-debug-sources.patch | 48 -------------------
.../vte/{vte_0.82.2.bb => vte_0.84.0.bb} | 6 ++-
2 files changed, 4 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch
rename meta/recipes-support/vte/{vte_0.82.2.bb => vte_0.84.0.bb} (90%)meta/recipes-support/vte/vte/0001-support-reproducibility-for-debug-sources.patch deleted +0 -48
@@ -1,48 +0,0 @@ -From 0959004adbe46f88d558d2ce61b496c662c196f5 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Mon, 3 Nov 2025 06:13:11 +0000 -Subject: [PATCH] support reproducibility for debug sources - -While option --debug-sources is used, the generated source file contains -build path comments which caused the build is not reproducible [1] -...subprojects/simdutf/simdutf.h... - 1 /* auto-generated on 2025-03-17 16:13:41 -0400. Do not edit! */ - 2 /* begin file include/simdutf.h */ - 3 // /build-dir/vte-0.82.1/subprojects/simdutf/include/simdutf.h:1 - 4 #ifndef SIMDUTF_H -...subprojects/simdutf/simdutf.h... - -After apply this commit, use relative path to instead -...subprojects/simdutf/simdutf.h... - 1 /* auto-generated on 2025-03-17 16:13:41 -0400. Do not edit! */ - 2 /* begin file include/simdutf.h */ - 3 // include/simdutf.h:1 - 4 #ifndef SIMDUTF_H -...subprojects/simdutf/simdutf.h... - -[1] https://reproducible-builds.org/ - -Upstream-Status: Submitted [https://github.com/simdutf/simdutf/pull/848] - -Signed-off-by: Hongxu Jia <[email protected]> ---- - singleheader/amalgamate.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py -index 190b2f6..75e0d78 100755 ---- a/singleheader/amalgamate.py -+++ b/singleheader/amalgamate.py -@@ -385,7 +385,8 @@ def filter_features(file): - current_features = None - elif enabled: - if context.args.debug_sources and not prev_line.endswith('\\'): -- yield f"// {file}:{lineno}" -+ RELFILE = os.path.relpath(file, PROJECTPATH) -+ yield f"// {RELFILE}:{lineno}" - - if line or (not line and prev_line): - yield line --- -2.48.1 -
meta/recipes-support/vte/vte_0.84.0.bb renamed from meta/recipes-support/vte/vte_0.82.2.bb +4 -2
@@ -18,10 +18,12 @@ GIDOCGEN_MESON_OPTION = "docs" inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ - file://0001-support-reproducibility-for-debug-sources.patch;patchdir=./subprojects/simdutf \ " -SRC_URI[archive.sha256sum] = "e1295aafc4682b3b550f1235dc2679baa0f71570d8ed543c001c1283d530be91" +SRC_URI[archive.sha256sum] = "0414e31583836aeb7878da25f67c515f7e8879917ecc37c92e26b83e8d8fc3e3" +# remove the below line when updating to vte 0.84.1 (or higher) as it includes +# https://gitlab.gnome.org/GNOME/vte/-/commit/77fe661760d2afac1e4d5a4b7eba477cbed6b430 +EXTRA_OEMESON += "-Dsimdutf:base64=true" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.47.3
PATCH 15/15 ovmf: upgrade edk2-stable202511 -> edk2-stable202605
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- ...Tools-StringFuncs-fix-gcc-16-warning.patch | 43 -------- ...ovmf-update-path-to-native-BaseTools.patch | 9 +- ...aseTools-EfiRom-fix-compiler-warning.patch | 45 -------- ...ile-adjust-to-build-in-under-bitbake.patch | 9 +- .../ovmf/ovmf/0003-debug-prefix-map.patch | 101 ++++-------------- .../ovmf/ovmf/0004-reproducible.patch | 29 +++-- ...ceptionHandlerLib-fix-push-instructi.patch | 46 -------- meta/recipes-core/ovmf/ovmf_git.bb | 7 +- 8 files changed, 43 insertions(+), 246 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0002-BaseTools-EfiRom-fix-compiler-warning.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch
meta/recipes-core/ovmf/ovmf/0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch deleted +0 -43
@@ -1,43 +0,0 @@ -From 3597306191297b504683b83fe7750e49c6a2e836 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <[email protected]> -Date: Thu, 29 Jan 2026 09:23:32 +0100 -Subject: [PATCH 1/2] BaseTools/StringFuncs: fix gcc 16 warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -StringFuncs.c: In function ‘SplitStringByWhitespace’: -StringFuncs.c:113:15: error: variable ‘Item’ set but not used [-Werror=unused-but-set-variable=] - 113 | UINTN Item; - | ^~~~ - -Signed-off-by: Gerd Hoffmann <[email protected]> -Upstream-Status: Backport ---- - BaseTools/Source/C/Common/StringFuncs.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/Common/StringFuncs.c b/BaseTools/Source/C/Common/StringFuncs.c -index 53e44365e9..df02d9c808 100644 ---- a/BaseTools/Source/C/Common/StringFuncs.c -+++ b/BaseTools/Source/C/Common/StringFuncs.c -@@ -110,7 +110,6 @@ SplitStringByWhitespace ( - CHAR8 *EndOfSubString; - CHAR8 *EndOfString; - STRING_LIST *Output; -- UINTN Item; - - String = CloneString (String); - if (String == NULL) { -@@ -120,7 +119,7 @@ SplitStringByWhitespace ( - - Output = NewStringList (); - -- for (Pos = String, Item = 0; Pos < EndOfString; Item++) { -+ for (Pos = String; Pos < EndOfString;) { - while (isspace ((int)*Pos)) { - Pos++; - } --- -2.53.0 -
meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +3 -6
@@ -1,7 +1,7 @@ -From 89a7bfe82c9dea89fa7d859eb392aa414a365578 Mon Sep 17 00:00:00 2001 +From 7a517d144ead6a50baab6eaf7d6d763620243440 Mon Sep 17 00:00:00 2001 From: Ricardo Neri <[email protected]> Date: Thu, 9 Jun 2016 02:23:01 -0700 -Subject: [PATCH 1/5] ovmf: update path to native BaseTools +Subject: [PATCH] ovmf: update path to native BaseTools BaseTools is a set of utilities to build EDK-based firmware. These utilities are used during the build process. Thus, they need to be built natively.
@@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [oe-core cross compile specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh -index 30f4830173..ce4ffb20ab 100755 +index ed3ed001b4..15f13424e5 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -24,7 +24,7 @@ then
@@ -28,6 +28,3 @@ index 30f4830173..ce4ffb20ab 100755 echo $EDK_TOOLS_PATH source edksetup.sh BaseTools else --- -2.47.3 -
meta/recipes-core/ovmf/ovmf/0002-BaseTools-EfiRom-fix-compiler-warning.patch deleted +0 -45
45 lines not on this page · raw message
meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +3 -6
@@ -1,7 +1,7 @@ -From 8b4941871ccc88ed8b31eb7ffc097e1fe39fe57d Mon Sep 17 00:00:00 2001 +From 5f9cc244e566bd28a2a9c46454d206d795a02847 Mon Sep 17 00:00:00 2001 From: Ricardo Neri <[email protected]> Date: Fri, 26 Jul 2019 17:34:26 -0400 -Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake +Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories.
@@ -18,7 +18,7 @@ Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 53e73abe53..0b3f9bbb2a 100644 +index d63f487724..0403f83f77 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -151,35 +151,34 @@ endif
@@ -64,6 +64,3 @@ index 53e73abe53..0b3f9bbb2a 100644 ifeq ($(HOST_ARCH), IA32) # # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults --- -2.47.3 -
meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch +22 -79
116 lines not on this page · raw message
meta/recipes-core/ovmf/ovmf/0004-reproducible.patch +13 -16
@@ -1,7 +1,7 @@ -From 8b218dffa0368fbc2bfb5d8051b358476266fcb4 Mon Sep 17 00:00:00 2001 +From 8ae6441f19c71347acab1e789517035ee458449e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 14 Jun 2021 19:57:30 +0200 -Subject: [PATCH 4/5] reproducible +Subject: [PATCH] reproducible This patch fixes various things which make the build more reproducible. Some changes here only change intermediate artefacts but that means when you have two build trees
@@ -35,7 +35,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c -index 83f1b285c2..e2f582f8fb 100644 +index bf4baf05d7..295f3f6efb 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -47,7 +47,7 @@ index 83f1b285c2..e2f582f8fb 100644 #endif #include <assert.h> #include <stdio.h> -@@ -995,7 +997,7 @@ ScanSections64 ( +@@ -996,7 +998,7 @@ ScanSections64 ( } mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +
@@ -56,7 +56,7 @@ index 83f1b285c2..e2f582f8fb 100644 // // Add more space in the .debug data region for the DllCharacteristicsEx -@@ -2329,7 +2331,7 @@ WriteDebug64 ( +@@ -2330,7 +2332,7 @@ WriteDebug64 ( EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry;
@@ -65,7 +65,7 @@ index 83f1b285c2..e2f582f8fb 100644 NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]; -@@ -2362,7 +2364,7 @@ WriteDebug64 ( +@@ -2363,7 +2365,7 @@ WriteDebug64 ( Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); Nb10->Signature = CODEVIEW_SIGNATURE_NB10;
@@ -89,10 +89,10 @@ index b829a2503c..afe826b78f 100644 if Input not in self.Inputs: self.Inputs.append(Input) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py -index e5f282c4ac..27a34ef7c6 100755 +index b729103efd..afc5b14a8a 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py -@@ -571,7 +571,7 @@ cleanlib: +@@ -579,7 +579,7 @@ cleanlib: os.remove(RespFileList) # convert source files and binary files to build targets
@@ -101,7 +101,7 @@ index e5f282c4ac..27a34ef7c6 100755 if len(self.ResultFileList) == 0 and len(MyAgo.SourceFileList) != 0: EdkLogger.error("build", AUTOGEN_ERROR, "Nothing to build", ExtraData="[%s]" % str(MyAgo)) -@@ -722,7 +722,7 @@ cleanlib: +@@ -730,7 +730,7 @@ cleanlib: OutputFile = '' DepsFileList = []
@@ -110,7 +110,7 @@ index e5f282c4ac..27a34ef7c6 100755 if Cmd[2]: for CopyCmd in Cmd[2]: Src, Dst = CopyCmd -@@ -755,7 +755,7 @@ cleanlib: +@@ -763,7 +763,7 @@ cleanlib: self.BuildTargetList.append('\t%s' % CmdString) self.ParseSecCmd(DepsFileList, Cmd[1])
@@ -119,7 +119,7 @@ index e5f282c4ac..27a34ef7c6 100755 self.BuildTargetList.append('%s : %s' % (self.ReplaceMacro(SecOutputFile), self.ReplaceMacro(SecDepsFile))) self.BuildTargetList.append('\t%s' % self.ReplaceMacro(SecCmd)) self.FfsOutputFileList = [] -@@ -794,13 +794,13 @@ cleanlib: +@@ -802,13 +802,13 @@ cleanlib: def CommandExceedLimit(self): FlagDict = {
@@ -140,7 +140,7 @@ index e5f282c4ac..27a34ef7c6 100755 } RespDict = {} -@@ -1014,9 +1014,9 @@ cleanlib: +@@ -1022,9 +1022,9 @@ cleanlib: if not self.ObjTargetDict.get(T.Target.SubDir): self.ObjTargetDict[T.Target.SubDir] = set() self.ObjTargetDict[T.Target.SubDir].add(NewFile)
@@ -153,7 +153,7 @@ index e5f282c4ac..27a34ef7c6 100755 if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: self.FileListMacros[T.FileListMacro] = [] diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py -index 764c51789b..40aadbcfbc 100755 +index c358d7f0e3..6ed48091fa 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -1429,6 +1429,9 @@ class ModuleAutoGen(AutoGen):
@@ -175,6 +175,3 @@ index 764c51789b..40aadbcfbc 100755 # Ignore generating makefile when it is a binary module if self.IsBinaryModule: --- -2.47.3 -
meta/recipes-core/ovmf/ovmf/0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-core/ovmf/ovmf_git.bb +2 -5
@@ -19,13 +19,10 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https;ta file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-debug-prefix-map.patch \ file://0004-reproducible.patch \ - file://0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch \ - file://0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch \ - file://0002-BaseTools-EfiRom-fix-compiler-warning.patch \ " -PV = "edk2-stable202511" -SRCREV = "46548b1adac82211d8d11da12dd914f41e7aa775" +PV = "edk2-stable202605" +SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" CVE_PRODUCT = "edk2"
Signature · 1 line
2.47.3