From patchwork Fri Dec 5 06:07:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 75928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBA51D2E009 for ; Fri, 5 Dec 2025 06:07:32 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.64332.1764914843642306860 for ; Thu, 04 Dec 2025 22:07:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=h2BHHVDM; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=4434d54add=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5B55RP4k843010 for ; Fri, 5 Dec 2025 06:07:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=14+qBcq3AD/tkyT+/wlCGn0aW5TayIufoRTVD81ANfk=; b=h2BHHVDM1MX8 LiWO40NA8F7Nxgr7LeBoe6zuPq/QPe9UMcI9FlQWnpJzWoEDDfjS5XXBKGbXfQel PFSkWT8zdWPIvaSUeaZIYq+aRxTXwoBLwYQjlwf+ZFFLal45CiEOiHW4a55kXAve XUbKax8vUchoXzqvmbtbe4pE8SFM568Vh3UkyUHcpOU7TWybgIaG6680Dq/dioQl ClyrJ/CGSdHZztUI8HphhqNXLKAm1poQFpLwcBf+E/EeRIBTwBJAP67vytJ+HziN AeTVOiqhqnBu+YHrIuF5iQyixx3gPi0sacTK1wxJG1MDqXkL+/PHkJSKzDwzds19 ddUz1cOU+Q== Received: from ala-exchng02.corp.ad.wrs.com ([128.224.246.37]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4audrgrntf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 05 Dec 2025 06:07:22 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.61; Thu, 4 Dec 2025 22:07:21 -0800 Received: from oak-lpgbuild14.wrs.com (10.11.232.110) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server id 15.1.2507.61 via Frontend Transport; Thu, 4 Dec 2025 22:07:21 -0800 From: To: Subject: [OE-core][PATCH V2] util-linux/util-linux-libuuid: upgrade from 2.41.1 to 2.41.2 Date: Fri, 5 Dec 2025 06:07:20 +0000 Message-ID: <20251205060720.3936234-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251204064429.559529-3-Qi.Chen@windriver.com> References: <20251204064429.559529-3-Qi.Chen@windriver.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=C+vkCAP+ c=1 sm=1 tr=0 ts=6932769a cx=c_pps a=Lg6ja3A245NiLSnFpY5YKQ==:117 a=Lg6ja3A245NiLSnFpY5YKQ==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=NEAV23lmAAAA:8 a=mDV3o1hIAAAA:8 a=t7CeM3EgAAAA:8 a=20KFwNOVAAAA:8 a=3gbuYyf7MMLreZPmfDYA:9 a=MBHTkq5ozfd5zzl9:21 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: D9Fhtmr3oU4ftHqCrAbgoMVVvxwYFmp4 X-Proofpoint-ORIG-GUID: D9Fhtmr3oU4ftHqCrAbgoMVVvxwYFmp4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjA1MDA0MCBTYWx0ZWRfX+snUyoCbxwYV BoCkTKNZjp1Z3VHgOKi+btJc6egxD2iR++/hknAFc0ktIhf1Id4wbEyXYbulZJ0ZYFTTXa3m9sJ DKj8Qzcc5bTNkkKdThnNBjUTZmkcFVc2JDCkx/mCfdXu3OL9pIbMIMLhxq/l4jomi+wRYtvJNr8 kdhtv2f9ac+ooaimZOjPcH/uorqgTbhwQHm6YLb852yP9sLiH19tWatXs2BGvni3vGWbgY6Jc7B dk9/LaMtxpno8iXBZUsCfbXvNv9oUde08s5ZyJBS2r6DPVoXxyJGiYtQW8CsepNujdhnZLr9zHn MNrz/Io3+EGZKWMvQpWkxDHOPV+qj8zf9AD71hi/MybKFTyL7mg/QUfzQ6/MuxsUcL0zFbo5PVN TyuYqjCKdy6LGVstO40baZ1xmgjKZA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-05_02,2025-12-04_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512050040 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 06:07:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/227333 From: Chen Qi The following two patches are dropped as they are in new version: util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch Ptest change: The new test case misc/colors needs lib/color-names.c. So copy it. Signed-off-by: Chen Qi --- ...2.41.1.bb => util-linux-libuuid_2.41.2.bb} | 0 meta/recipes-core/util-linux/util-linux.inc | 4 +- ...nt-api-utils-avoid-using-sys-mount.h.patch | 29 ---------- ...st_sigstate.c-explicitly-reset-SIGIN.patch | 55 ------------------- ...l-linux_2.41.1.bb => util-linux_2.41.2.bb} | 2 + 5 files changed, 3 insertions(+), 87 deletions(-) rename meta/recipes-core/util-linux/{util-linux-libuuid_2.41.1.bb => util-linux-libuuid_2.41.2.bb} (100%) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch rename meta/recipes-core/util-linux/{util-linux_2.41.1.bb => util-linux_2.41.2.bb} (99%) diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.41.1.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.41.2.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.41.1.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.41.2.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e7a3c5be9f..c29011ad61 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,10 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin 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-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch \ - file://0001-include-mount-api-utils-avoid-using-sys-mount.h.patch \ " -SRC_URI[sha256sum] = "be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57" +SRC_URI[sha256sum] = "6062a1d89b571a61932e6fc0211f36060c4183568b81ee866cf363bce9f6583e" CVE_PRODUCT = "util-linux" diff --git a/meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch b/meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch deleted file mode 100644 index 544f45362d..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 21 Aug 2025 09:59:10 +0200 -Subject: [PATCH] include/mount-api-utils: avoid using sys/mount.h - -The file is unnecessary and introduces duplicate #define of MS_* macros. - -Fixes: https://github.com/util-linux/util-linux/issues/3674 -Signed-off-by: Karel Zak -Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88] ---- - include/mount-api-utils.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h -index 920d6766a..e35524168 100644 ---- a/include/mount-api-utils.h -+++ b/include/mount-api-utils.h -@@ -6,7 +6,6 @@ - #define UTIL_LINUX_MOUNT_API_UTILS - - #ifdef HAVE_LINUX_MOUNT_H --#include - #include - #include - #include --- -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 deleted file mode 100644 index 324798cfd5..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 383efe26a2a61b420d369cd2c23f03d1d690d425 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 - default action after trapping - -After upgrading bash to 5.3 to contain commit [1], if SIGINT was trapped in -asynchronous subshell, bash called set_signal_async_ignored to make sure -processes that are created by this asynchronous subshell to ignore SIGINT. - -And it caused test case `kill/decode' failed, the signal INT was existed in -both of Blocked and Ignored - -$ ./tests/run.sh --use-system-commands --parsable --show-diff kill/decode -... -diff-{{{ -|--- /usr/lib/util-linux/ptest/tests/expected/kill/decode 2011-04-05 23:00:00.000000000 +0000 -|+++ /usr/lib/util-linux/ptest/tests/output/kill/decode 2025-07-28 12:09:46.279000000 +0000 -@@ -16,5 +16,5 @@ - Pending (thread): INT ILL - Pending (process): USR1 - Blocked: INT ILL ABRT FPE USR1 SEGV TERM --Ignored: HUP QUIT TRAP PIPE ALRM -+Ignored: HUP INT QUIT TRAP PIPE ALRM - Caught: ILL USR1 -}}}-diff -... - -Explicitly reset SIGINT to default action after trapping, then the -test case `kill/decode' works on both of old (<5.3) and new (>=5.3) bash - -[1] https://cgit.git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=a5d2617c7a7e602ace1f4149987cdfd075c4e762 - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3666] - -Signed-off-by: Hongxu Jia ---- - tests/helpers/test_sigstate.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/helpers/test_sigstate.c b/tests/helpers/test_sigstate.c -index 52c7dcb..b631ec2 100644 ---- a/tests/helpers/test_sigstate.c -+++ b/tests/helpers/test_sigstate.c -@@ -68,6 +68,7 @@ int main(int argc _U_, char **argv _U_) - sigignore(SIGPIPE); - sigignore(SIGALRM); - -+ signal(SIGINT, SIG_DFL); - 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_2.41.1.bb b/meta/recipes-core/util-linux/util-linux_2.41.2.bb similarity index 99% rename from meta/recipes-core/util-linux/util-linux_2.41.1.bb rename to meta/recipes-core/util-linux/util-linux_2.41.2.bb index 08bca065b2..f01cbaba9f 100644 --- a/meta/recipes-core/util-linux/util-linux_2.41.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.41.2.bb @@ -401,6 +401,8 @@ do_install_ptest() { cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ cp ${B}/config.h ${D}${PTEST_PATH} + # for misc/color ts + mkdir ${D}${PTEST_PATH}/lib && cp ${S}/lib/color-names.c ${D}${PTEST_PATH}/lib/ sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest