util-linux: replace submitted patches with a merged one
PATCH 1/1 util-linux: replace submitted patches with a merged one
From: Chen Qi <[email protected]>
The original PR, https://github.com/util-linux/util-linux/pull/3605,
was updated. Use the merged patch to avoid any confusion.
Signed-off-by Chen Qi <[email protected]>
---
meta/recipes-core/util-linux/util-linux.inc | 3 +-
...01-test_sysinfo.c-print-out-SIGRTMIN.patch | 50 -------------------
...e-RTMIN-from-kill-L-instead-of-hard.patch} | 16 +++---
3 files changed, 10 insertions(+), 59 deletions(-)
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch
rename meta/recipes-core/util-linux/util-linux/{0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch => 0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch} (76%)meta/recipes-core/util-linux/util-linux.inc +1 -2
@@ -19,8 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://fcntl-lock.c \ 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-test_sysinfo.c-print-out-SIGRTMIN.patch \ - file://0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch \ + file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ " SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6"
meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch renamed from meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch +9 -7
@@ -1,7 +1,7 @@ -From 9848b0d8c90d9a24275bf402f6d76e97f62b3ba4 Mon Sep 17 00:00:00 2001 +From c5d5e8873029d170fcab38a6fbd5d5a355574b9f Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 4 Jun 2025 16:27:19 +0800 -Subject: [PATCH 2/2] ts/kill/decode: use SIGRTMIN from test_sysinfo instead of +Subject: [PATCH] ts/kill/decode: use RTMIN from 'kill -L' instead of hardcoding 34 glibc uses 34 as the value of SIGRTMIN:
@@ -16,9 +16,11 @@ With the hardcoded 34, test case fails with the following difference: -Ignored: HUP QUIT TRAP PIPE ALRM +Ignored: HUP QUIT TRAP PIPE ALRM 34 -Use SIGRTMIN got from test_sysinfo to fix this issue. +Extract the value of RTMIN from 'kill -L' to avoid such hardcoding. -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3605] +Signed-off-by: Chen Qi <[email protected]> + +Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/c5d5e8873029d170fcab38a6fbd5d5a355574b9f] Signed-off-by: Chen Qi <[email protected]> ---
@@ -26,15 +28,15 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode -index 03bc25ff6..dd34aacef 100755 +index 57149899e..524b4e5e2 100755 --- a/tests/ts/kill/decode +++ b/tests/ts/kill/decode -@@ -48,14 +48,19 @@ ACK= +@@ -53,14 +53,19 @@ ACK= # Sending one more USR1 is for making the signal pending state. "$TS_CMD_KILL" -USR1 "$PID" "$TS_CMD_KILL" -d "$PID" | { - if [[ $("$TS_CMD_KILL" --list=34) == RT0 ]]; then -+ SIGRTMIN=$($TS_HELPER_SYSINFO SIGRTMIN) ++ SIGRTMIN=$("$TS_CMD_KILL" -L | grep -o '[0-9]\+ RTMIN' | cut -d " " -f 1) + if [[ $("$TS_CMD_KILL" --list=$SIGRTMIN) == RT0 ]]; then # See man signal(7). # The Linux kernel supports a range of 33 different real-time signals,
Signature · 1 line
2.34.1