From: Martin Jansa <[email protected]>

It doesn't apply after udev-builtin-path_id.c was also updated by
CVE-2026-40225-01.patch in
https://git.openembedded.org/openembedded-core/commit/?h=scarthgap&id=fc2d33dbb2d5180b77c10865156db342f9d582da

causing do_patch failure for scarthgap builds with musl:

Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- rejects in file src/udev/udev-builtin-net_id.c
patching file src/udev/udev-builtin-path_id.c
patching file src/udev/udev-event.c
patching file src/udev/udev-rules.c
Patch 0003-src-basic-missing.h-check-for-missing-strndupa.patch does not apply 
(enforce with -f)

stderr: ')
ERROR: Logfile of failure stored in: 
/OE/build/oe-core/tmp-musl/work/core2-64-oe-linux-musl/systemd/255.21/temp/log.do_patch.215528
ERROR: Task 
(/OE/build/oe-core/openembedded-core/meta/recipes-core/systemd/systemd_255.21.bb:do_patch)
 failed with exit code '1'

Signed-off-by: Martin Jansa <[email protected]>
---
 .../0003-src-basic-missing.h-check-for-missing-strndupa.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
 
b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
index 715a0c7ec8..41db643258 100644
--- 
a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
+++ 
b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -655,10 +655,10 @@ diff --git a/src/udev/udev-builtin-net_id.c 
b/src/udev/udev-builtin-net_id.c
 index 91b40088f4..f528a46b8e 100644
 --- a/src/udev/udev-builtin-net_id.c
 +++ b/src/udev/udev-builtin-net_id.c
-@@ -39,6 +39,7 @@
- #include "strv.h"
+@@ -40,6 +40,7 @@
  #include "strxcpyx.h"
  #include "udev-builtin.h"
+ #include "utf8.h"
 +#include "missing_stdlib.h"
  
  #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#236985): 
https://lists.openembedded.org/g/openembedded-core/message/236985
Mute This Topic: https://lists.openembedded.org/mt/119297330/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to