diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.41.1.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.41.1.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7d6759a2c0..c5698d9cab 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -23,6 +23,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch \ " -SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6" +SRC_URI[sha256sum] = "be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57" CVE_PRODUCT = "util-linux" diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch b/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch index e3f9112192..5b738877cd 100644 --- a/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch +++ b/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch @@ -1,4 +1,4 @@ -From b3a1d92a9078fada31b2cf64b802edd616026766 Mon Sep 17 00:00:00 2001 +From edbab1d7fb31e07130c1912742ed7e400f3d9c3d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 26 May 2025 15:24:16 +0800 Subject: [PATCH] lsfd/mkfds-foreign-sockets: skip when lacking sock_diag @@ -19,7 +19,7 @@ Signed-off-by: Chen Qi 1 file changed, 2 insertions(+) diff --git a/tests/ts/lsfd/mkfds-foreign-sockets b/tests/ts/lsfd/mkfds-foreign-sockets -index cd94da799..76138a7a6 100755 +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 @@ -31,6 +31,3 @@ index cd94da799..76138a7a6 100755 declare -A tcase tcase[NAME]="state=connected" tcase[SOCK.NETNS]= --- -2.34.1 - diff --git a/meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch b/meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch index 324798cfd5..ffa9122afe 100644 --- a/meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch +++ b/meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch @@ -1,4 +1,4 @@ -From 383efe26a2a61b420d369cd2c23f03d1d690d425 Mon Sep 17 00:00:00 2001 +From 0ae5342f96d0aa637b59685ada07ad808d926dd2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 28 Jul 2025 20:35:13 +0800 Subject: [PATCH] tests/helpers/test_sigstate.c: explicitly reset SIGINT to @@ -50,6 +50,3 @@ index 52c7dcb..b631ec2 100644 signal(SIGBUS, SIG_DFL); signal(SIGFPE, SIG_DFL); signal(SIGSEGV, SIG_DFL); --- -2.34.1 - diff --git a/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch b/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch index dece0e94b7..2dd9203ce2 100644 --- a/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch +++ b/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch @@ -1,4 +1,4 @@ -From d2eeccf36542d506b660641a07a44f3976772897 Mon Sep 17 00:00:00 2001 +From 62fc9b251b5823037f51017e9d380eb3ae701351 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 15 May 2025 16:44:33 +0800 Subject: [PATCH] tests/ts/kill/decode: avoid using shell built-in kill command @@ -16,7 +16,7 @@ Signed-off-by: Chen Qi 1 file changed, 5 insertions(+) diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode -index 03bc25ff6..57149899e 100755 +index 03bc25f..5714989 100755 --- a/tests/ts/kill/decode +++ b/tests/ts/kill/decode @@ -18,6 +18,11 @@ TS_DESC="decode functions" @@ -31,6 +31,3 @@ index 03bc25ff6..57149899e 100755 ts_skip_qemu_user ts_check_test_command "$TS_CMD_KILL" --- -2.34.1 - diff --git a/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch b/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch index f4e2f9e745..0edc71148b 100644 --- a/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch +++ b/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch @@ -1,4 +1,4 @@ -From c5d5e8873029d170fcab38a6fbd5d5a355574b9f Mon Sep 17 00:00:00 2001 +From 2c9a2b36914b10e501282369bd1c9650e42e5b18 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jun 2025 16:27:19 +0800 Subject: [PATCH] ts/kill/decode: use RTMIN from 'kill -L' instead of @@ -28,7 +28,7 @@ Signed-off-by: Chen Qi 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode -index 57149899e..524b4e5e2 100755 +index 5714989..524b4e5 100755 --- a/tests/ts/kill/decode +++ b/tests/ts/kill/decode @@ -53,14 +53,19 @@ ACK= @@ -53,6 +53,3 @@ index 57149899e..524b4e5e2 100755 else cat fi --- -2.34.1 - diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch index fe92afbc53..9d750b125b 100644 --- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 43030388e831642d36cb7b9d4b63755e9696714a Mon Sep 17 00:00:00 2001 +From 0d8e0ca77d9663e729529f39896525d7ba833581 Mon Sep 17 00:00:00 2001 From: Tudor Florea 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 43a23a5..4a84531 100644 +index 2c44034..427e1bd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch index ebb32a6845..714c11de14 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch @@ -1,4 +1,4 @@ -From 378998bf82e3b6ff46569077b29f95e72b734681 Mon Sep 17 00:00:00 2001 +From 22ee8288a70b0ac546c408978509f5b47673699d Mon Sep 17 00:00:00 2001 From: Phil Blundell 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 a5d9102..43a23a5 100644 +index d1c1840..2c44034 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,10 @@ AC_SUBST([runstatedir]) diff --git a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch index fa4ae02bc3..488cca2f13 100644 --- a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch +++ b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch @@ -1,4 +1,4 @@ -From 728c2abd889d225535008c3e7a1eef4b8a0aeea2 Mon Sep 17 00:00:00 2001 +From e3e2c92cb4383f89e6dc61e0cbd4fb857984713b Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Display testname for subtest diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch index ad23001cfa..bf4f839317 100644 --- a/meta/recipes-core/util-linux/util-linux/ptest.patch +++ b/meta/recipes-core/util-linux/util-linux/ptest.patch @@ -1,4 +1,4 @@ -From 18bf6aded9b2a75185ae4b23a41cd2e4322c5e31 Mon Sep 17 00:00:00 2001 +From dcbc5231d8d3d6116046eceb4a42daa53e5d0b86 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Define TESTS variable diff --git a/meta/recipes-core/util-linux/util-linux_2.41.bb b/meta/recipes-core/util-linux/util-linux_2.41.1.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux_2.41.bb rename to meta/recipes-core/util-linux/util-linux_2.41.1.bb