util-linux/util-linux-libuuid: upgrade from 2.40.4 to 2.41
PATCH v2 1/1 util-linux/util-linux-libuuid: upgrade from 2.40.4 to 2.41
From: Chen Qi <[email protected]>
License-Update: add EUPL-1.2.
See https://github.com/util-linux/util-linux/commit/74f3265b9a079f9f60ad6e606d77deae0029a43a
0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch is a backported patch to fix kill/decode test case.
0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch is used to fix testcase failure of lsfd/mkfds-foreign-sockets.
lsfd/option-inet is removed out of the excluded list because upstream has fixed the issue:
https://github.com/util-linux/util-linux/commit/eaa3870880aaa8d3d6b1aa8ea6bb19a717708b8e
---
...d_2.40.4.bb => util-linux-libuuid_2.41.bb} | 0
meta/recipes-core/util-linux/util-linux.inc | 12 +-
...dd-sector-size-commanand-line-option.patch | 90 ---------------
...gn-sockets-skip-when-lacking-sock_di.patch | 36 ++++++
...code-avoid-using-shell-built-in-kill.patch | 36 ++++++
...dd-sector-size-commanand-line-option.patch | 105 ------------------
.../util-linux/avoid_parallel_tests.patch | 4 +-
.../util-linux/configure-sbindir.patch | 4 +-
.../display_testname_for_subtest.patch | 6 +-
.../util-linux/util-linux/ptest.patch | 6 +-
.../util-linux/util-linux/run-ptest | 4 +-
...til-linux_2.40.4.bb => util-linux_2.41.bb} | 0
12 files changed, 90 insertions(+), 213 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-libuuid_2.40.4.bb => util-linux-libuuid_2.41.bb} (100%)
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-cfdisk-add-sector-size-commanand-line-option.patch
create mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch
create 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/0002-sfdisk-add-sector-size-commanand-line-option.patch
rename meta/recipes-core/util-linux/{util-linux_2.40.4.bb => util-linux_2.41.bb} (100%)meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.40.4.bb +0 -0
meta/recipes-core/util-linux/util-linux.inc +7 -5
@@ -6,20 +6,22 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT" +LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT & EUPL-1.2" LICENSE:${PN}-fcntl-lock = "MIT" LICENSE:${PN}-fdisk = "GPL-1.0-or-later" LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" LICENSE:${PN}-libmount = "LGPL-2.1-or-later" LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" +LICENSE:${PN}-coresched = "EUPL-1.2" -LIC_FILES_CHKSUM = "file://README.licensing;md5=ddd58b6c94da86ff4f03e91208eb9cfc \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ + file://Documentation/licenses/COPYING.EUPL-1.2;md5=c075d2767167a2355b23392018a1cbbd \ file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \
@@ -38,10 +40,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://fcntl-lock.c \ - file://0001-cfdisk-add-sector-size-commanand-line-option.patch \ - file://0002-sfdisk-add-sector-size-commanand-line-option.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 \ " -SRC_URI[sha256sum] = "5c1daf733b04e9859afdc3bd87cc481180ee0f88b5c0946b16fdec931975fb79" +SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6" CVE_PRODUCT = "util-linux"
meta/recipes-core/util-linux/util-linux/0001-cfdisk-add-sector-size-commanand-line-option.patch deleted +0 -90
90 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 new file +36 -0
@@ -0,0 +1,36 @@ +From b3a1d92a9078fada31b2cf64b802edd616026766 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 cd94da799..76138a7a6 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]= +-- +2.34.1 +
meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch new file +36 -0
@@ -0,0 +1,36 @@ +From d2eeccf36542d506b660641a07a44f3976772897 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 03bc25ff6..57149899e 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" +-- +2.34.1 +
meta/recipes-core/util-linux/util-linux/0002-sfdisk-add-sector-size-commanand-line-option.patch deleted +0 -105
105 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 da58b4150f6932de36c962ea657713bcf4ea44be Mon Sep 17 00:00:00 2001 +From 43030388e831642d36cb7b9d4b63755e9696714a 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 651ef2b..2a8012e 100644 +index 43a23a5..4a84531 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 0387d71516c978899cfd556ca512f530a212b4a9 Mon Sep 17 00:00:00 2001 +From 378998bf82e3b6ff46569077b29f95e72b734681 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 23594ff..651ef2b 100644 +index a5d9102..43a23a5 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 +3 -3
@@ -1,4 +1,4 @@ -From 45450d0339cd7ee27f53c0f2fac1cc74ed9bbfb8 Mon Sep 17 00:00:00 2001 +From 728c2abd889d225535008c3e7a1eef4b8a0aeea2 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,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions.sh b/tests/functions.sh -index 5fe5ba0..a6c703e 100644 +index 1d7a425..b1f0986 100644 --- a/tests/functions.sh +++ b/tests/functions.sh -@@ -450,7 +450,7 @@ function ts_init_subtest { +@@ -455,7 +455,7 @@ function ts_init_subtest { if [ "$TS_PARSABLE" != "yes" ]; then [ $TS_NSUBTESTS -eq 1 ] && echo
meta/recipes-core/util-linux/util-linux/ptest.patch +3 -3
@@ -1,4 +1,4 @@ -From f9be73c3e2b0a4f0923950dcb058be85d3ee8ed7 Mon Sep 17 00:00:00 2001 +From 18bf6aded9b2a75185ae4b23a41cd2e4322c5e31 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 50ab8d0..7e2340d 100644 +index 01e9970..c3313ff 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -64,6 +64,7 @@ tmpfiles_DATA = +@@ -66,6 +66,7 @@ sysusers_DATA = dist_bashcompletion_DATA = check_PROGRAMS = dist_check_SCRIPTS =
meta/recipes-core/util-linux/util-linux/run-ptest +1 -3
@@ -22,10 +22,8 @@ modprobe loop # for a long description of mount namespaces in Linux mount --make-shared / -# lsfd/option-inet has races in the test script: -# https://github.com/util-linux/util-linux/issues/2399 # lsfd/mkfds-bpf* have issues with the gcc 15 upgrade -./tests/run.sh --use-system-commands --parsable --show-diff --exclude='lsfd/option-inet lsfd/mkfds-bpf-map lsfd/mkfds-bpf-prog' | sed -u '{ +./tests/run.sh --use-system-commands --parsable --show-diff --exclude='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.41.bb renamed from meta/recipes-core/util-linux/util-linux_2.40.4.bb +0 -0
Signature · 1 line
2.34.1
Quoted 11 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
License-Update: add EUPL-1.2.
See https://github.com/util-linux/util-linux/commit/74f3265b9a079f9f60ad6e606d77deae0029a43a0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch is a backported patch to fix kill/decode test case.
0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch is used to fix testcase failure of lsfd/mkfds-foreign-sockets.
Quoted 6 lines
lsfd/option-inet is removed out of the excluded list because upstream has fixed the issue:
https://github.com/util-linux/util-linux/commit/eaa3870880aaa8d3d6b1aa8ea6bb19a717708b8eSigned-off-by Chen Qi <[email protected]>---
Hi Chen,
Thanks for the v2.
It looks like util-linux ptests are failing after applying this patch:
Failed ptests:
{'util-linux': ['su:_environ']}
https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/1566
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1567
Ptest logs can be found here:
https://valkyrie.yocto.io/pub/non-release/20250526-63/testresults/qemuarm64-ptest/core-image-ptest-util-linux/
https://valkyrie.yocto.io/pub/non-release/20250526-63/testresults/qemux86-64-ptest/core-image-ptest-util-linux/
Can you have a look at these failures please?
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
I can reproduce the issue by ensuring 'pam' not in DISTRO_FEATURES. I'll send out a new patch soon.
Regards,
Qi
-----Original Message-----
From: Mathieu Dubois-Briand <[email protected]>
Sent: Monday, May 26, 2025 8:28 PM
To: Chen, Qi <[email protected]>; [email protected]
Subject: Re: [OE-core][PATCH V2] util-linux/util-linux-libuuid: upgrade from 2.40.4 to 2.41
Quoted 13 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
License-Update: add EUPL-1.2.
See
https://github.com/util-linux/util-linux/commit/74f3265b9a079f9f60ad6e606d77deae0029a43a0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch is a backported patch to fix kill/decode test case.
0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch is used to fix testcase failure of lsfd/mkfds-foreign-sockets.
Quoted 7 lines
lsfd/option-inet is removed out of the excluded list because upstream has fixed the issue:
https://github.com/util-linux/util-linux/commit/eaa3870880aaa8d3d6b1aa8ea6bb19a717708b8eSigned-off-by Chen Qi <[email protected]>---
Hi Chen,
Thanks for the v2.
It looks like util-linux ptests are failing after applying this patch:
Failed ptests:
{'util-linux': ['su:_environ']}
https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/1566
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1567
Ptest logs can be found here:
https://valkyrie.yocto.io/pub/non-release/20250526-63/testresults/qemuarm64-ptest/core-image-ptest-util-linux/
https://valkyrie.yocto.io/pub/non-release/20250526-63/testresults/qemux86-64-ptest/core-image-ptest-util-linux/
Can you have a look at these failures please?
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com