util-linux: replace submitted patches with a merged one

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 <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 6611ec0fe74aa856268bd5d74faa7fcdb9459b46..111f29cb928723a8741918f11cf9e84e687325da 100644 (file)
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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"

diff --git a/meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch b/meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch
deleted file mode 100644 (file)
index ee9f220..0000000
--- a/meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 50774e34fee0cd528b195a863bcd4e3a04fbfc4b Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Wed, 4 Jun 2025 10:52:18 +0800
-Subject: [PATCH 1/2] test_sysinfo.c: print out SIGRTMIN
-
-This will be used by ts/kill/decode.
-
-Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3605]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- tests/helpers/test_sysinfo.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c
-index 1559d471f..3a791e7f1 100644
---- a/tests/helpers/test_sysinfo.c
-+++ b/tests/helpers/test_sysinfo.c
-@@ -27,6 +27,7 @@
- #include <errno.h>
- #include <time.h>
- #include <sys/ioctl.h>
-+#include <signal.h>
- 
- #include "c.h"
- 
-@@ -116,6 +117,12 @@ static int hlp_ulong_max32(void)
-       return 0;
- }
- 
-+static int hlp_sigrtmin(void)
-+{
-+      printf("%d\n", SIGRTMIN);
-+      return 0;
-+}
-+
- static int hlp_wcsspn_ok(void)
- {
-       printf("%d\n", wcsspn(L"FOO", L"F") == 1);
-@@ -229,6 +236,7 @@ static const mntHlpfnc hlps[] =
-       { "ULONG_MAX",  hlp_ulong_max   },
-       { "ULONG_MAX32",hlp_ulong_max32 },
-       { "UINT64_MAX", hlp_u64_max     },
-+      { "SIGRTMIN",   hlp_sigrtmin    },
-       { "byte-order", hlp_endianness  },
-       { "wcsspn-ok",  hlp_wcsspn_ok   },
-       { "enotty-ok",  hlp_enotty_ok   },
--- 
-2.34.1
-

diff --git a/meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch b/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch
similarity index 76%
rename from meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch
rename to meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch
index 5a00c9037a3f9f7978957f9ec1c58e926c773428..f4e2f9e745391d21602cb7beb6969de851db1aa6 100644 (file)
--- a/meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch
+++ b/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch
@@ -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 <Qi.Chen@windriver.com>
 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 <Qi.Chen@windriver.com>
+
+Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/c5d5e8873029d170fcab38a6fbd5d5a355574b9f]
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 ---
@@ -26,15 +28,15 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  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,