| Message ID | 20260101205003.98143-1-peter.marko@siemens.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Steve Sakoman |
| Headers | show |
| Series | [whinlatter,1/2] util-linux/util-linux-libuuid: upgrade from 2.41.1 to 2.41.2 | expand |
Hi Peter, Not sure which of the two patches is the culprit, but I'm getting autobuilder errors with this patchset: https://errors.yoctoproject.org/Errors/Details/893403/ I've confirmed that the error goes away when I remove these two patches, and returns when I add them back. Steve On Thu, Jan 1, 2026 at 12:50 PM Peter Marko via lists.openembedded.org <peter.marko=siemens.com@lists.openembedded.org> wrote: > > From: Chen Qi <Qi.Chen@windriver.com> > > 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 <Qi.Chen@windriver.com> > Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > (From OE-Core rev: 4d1d3f446577711057d1c51ac42e5dc9633b496a) > > Signed-off-by: Peter Marko <peter.marko@siemens.com> > --- > ...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 <kzak@redhat.com> > -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 <kzak@redhat.com> > -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 <sys/mount.h> > - #include <linux/mount.h> > - #include <linux/unistd.h> > - #include <sys/syscall.h> > --- > -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 <hongxu.jia@windriver.com> > -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 <hongxu.jia@windriver.com> > ---- > - 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 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#228831): https://lists.openembedded.org/g/openembedded-core/message/228831 > Mute This Topic: https://lists.openembedded.org/mt/117032687/3620601 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com] > -=-=-=-=-=-=-=-=-=-=-=- >
OK, I'll submit a CVE patch instead of these upgrades. Peter > -----Original Message----- > From: Steve Sakoman <steve@sakoman.com> > Sent: Sunday, January 4, 2026 21:53 > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com> > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core][whinlatter][PATCH 1/2] util-linux/util-linux-libuuid: upgrade > from 2.41.1 to 2.41.2 > > Hi Peter, > > Not sure which of the two patches is the culprit, but I'm getting > autobuilder errors with this patchset: > > https://errors.yoctoproject.org/Errors/Details/893403/ > > I've confirmed that the error goes away when I remove these two > patches, and returns when I add them back. > > Steve > > On Thu, Jan 1, 2026 at 12:50 PM Peter Marko via lists.openembedded.org > <peter.marko=siemens.com@lists.openembedded.org> wrote: > > > > From: Chen Qi <Qi.Chen@windriver.com> > > > > 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 <Qi.Chen@windriver.com> > > Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > > (From OE-Core rev: 4d1d3f446577711057d1c51ac42e5dc9633b496a) > > > > Signed-off-by: Peter Marko <peter.marko@siemens.com> > > --- > > ...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 <kzak@redhat.com> > > -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 <kzak@redhat.com> > > -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 <sys/mount.h> > > - #include <linux/mount.h> > > - #include <linux/unistd.h> > > - #include <sys/syscall.h> > > --- > > -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 <hongxu.jia@windriver.com> > > -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=a5d2617c7a7e > 602ace1f4149987cdfd075c4e762 > > - > > -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3666] > > - > > -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > > ---- > > - 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 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#228831): https://lists.openembedded.org/g/openembedded- > core/message/228831 > > Mute This Topic: https://lists.openembedded.org/mt/117032687/3620601 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub > [steve@sakoman.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
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 <kzak@redhat.com> -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 <kzak@redhat.com> -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 <sys/mount.h> - #include <linux/mount.h> - #include <linux/unistd.h> - #include <sys/syscall.h> --- -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 <hongxu.jia@windriver.com> -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 <hongxu.jia@windriver.com> ---- - 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