Skip to contentSkip to conversation

nodejs: Make libuv related patch conditionally

PATCH In review [email protected] 2 participants 3 messages Jan 12 – Jan 14

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nodejs: Make libuv related patch conditionally

From: Mingli Yu <[email protected]>

Fixes:
ERROR: nodejs-22.21.1-r0 do_patch: Applying patch '0001-deps-disable-io_uring-support-in-libuv.patch' on target directory '/build/tmp/work/core2-32-poky-linux/nodejs/22.21.1/sources/node-v22.21.1' CmdError('quilt --quiltrc /build/tmp/work/core2-32-poky-linux/nodejs/22.21.1/recipe-sysroot-native/etc/quiltrc push', 0, "stdout: Applying patch 0001-deps-disable-io_uring-support-in-libuv.patch can't find file to patch at input line 27

The sources which related to libuv as deps/uv/ are removed when depends on libuv.

So make the 0001-deps-disable-io_uring-support-in-libuv.patch conditionally to fix the gap.

---
 meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb +1 -1
index ccaf9f7bb2..489fcbde45 100644
@@ -27,7 +27,7 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://system-c-ares.patch \
            file://0001-liftoff-Correct-function-signatures.patch \
            file://libatomic.patch \
-           file://0001-deps-disable-io_uring-support-in-libuv.patch \
+           ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '', 'file://0001-deps-disable-io_uring-support-in-libuv.patch', d)} \
            file://0001-positional-args.patch \
            file://0001-custom-env.patch \
            file://0001-build-remove-redundant-mXX-flags-for-V8.patch \
Signature · 1 line
2.34.1
#1 lore raw

I wonder if its better to change

do_unpack[postfuncs] += "prune_sources"

to

do_patch[postfuncs] += "prune_sources"

conditional patching is error prone on upgrades etc.

Quoted 54 lines · Mingli via lists.openembedded.org

From: Mingli Yu <[email protected]>

Fixes:
ERROR: nodejs-22.21.1-r0 do_patch: Applying patch
'0001-deps-disable-io_uring-support-in-libuv.patch' on target directory '/build/tmp/work/core2-32-poky-linux/nodejs/22.21.1/sources/node-v22.21.1'
CmdError('quilt --quiltrc
/build/tmp/work/core2-32-poky-linux/nodejs/22.21.1/recipe-sysroot-native/etc/quiltrc push', 0, "stdout: Applying patch 0001-deps-disable-io_uring-support-in-libuv.patch
can't find file to patch at input line 27

The sources which related to libuv as deps/uv/ are removed when depends on libuv.

So make the 0001-deps-disable-io_uring-support-in-libuv.patch conditionally to fix the gap.

---
 meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb +1 -1
index ccaf9f7bb2..489fcbde45 100644
@@ -27,7 +27,7 @@ SRC_URI = "
 https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://system-c-ares.patch \
            file://0001-liftoff-Correct-function-signatures.patch \
            file://libatomic.patch \
-           file://0001-deps-disable-io_uring-support-in-libuv.patch \
+           ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '',
 'file://0001-deps-disable-io_uring-support-in-libuv.patch', d)} \
            file://0001-positional-args.patch \
            file://0001-custom-env.patch \
            file://0001-build-remove-redundant-mXX-flags-for-V8.patch \

--
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#123364):
https://lists.openembedded.org/g/openembedded-devel/message/123364
Mute This Topic: https://lists.openembedded.org/mt/117220566/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#2 lore raw
Quoted 10 lines · Khem Raj

**
*CAUTION: This email comes from a non Wind River email account!*
Do not click links or open attachments unless you recognize the sender and know the content is safe. I wonder if its better to change

do_unpack[postfuncs] += "prune_sources"

to

do_patch[postfuncs] += "prune_sources"

Thanks! v2 is sent.

Thanks,

Quoted 93 lines

conditional patching is error prone on upgrades etc.

On Mon, Jan 12, 2026 at 12:24 AM Yu, Mingli via lists.openembedded.org <https://urldefense.com/v3/__http://lists.openembedded.org__;!! AjveYdw8EvQ! atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD- urjGmwlhvcB67Rl-LRUMebt9s$> <[email protected] <mailto:[email protected]>> wrote:

    From: Mingli Yu <[email protected]
    <mailto:[email protected]>>

    Fixes:
       ERROR: nodejs-22.21.1-r0 do_patch: Applying patch '0001-deps-
    disable-io_uring-support-in-libuv.patch' on target directory '/
    build/tmp/work/core2-32-poky-linux/nodejs/22.21.1/sources/node-v22.21.1'
       CmdError('quilt --quiltrc /build/tmp/work/core2-32-poky-linux/
    nodejs/22.21.1/recipe-sysroot-native/etc/quiltrc push', 0, "stdout:
    Applying patch 0001-deps-disable-io_uring-support-in-libuv.patch
       can't find file to patch at input line 27

    The sources which related to libuv as deps/uv/ are removed when
    depends on
    libuv.

    So make the 0001-deps-disable-io_uring-support-in-libuv.patch
    conditionally
    to fix the gap.

    Signed-off-by: Mingli Yu <[email protected]
    <mailto:[email protected]>>
    ---
      meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb <https://
    urldefense.com/v3/__http://nodejs_22.21.1.bb__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRCOHDgpo$> | 2 +-
      1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb
    <https://urldefense.com/v3/__http://nodejs_22.21.1.bb__;!!
    AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRCOHDgpo$> b/meta-oe/recipes-devtools/nodejs/
    nodejs_22.21.1.bb <https://urldefense.com/v3/__http://
    nodejs_22.21.1.bb__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRCOHDgpo$>
    index ccaf9f7bb2..489fcbde45 100644
    --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb <https://
    urldefense.com/v3/__http://nodejs_22.21.1.bb__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRCOHDgpo$>
    +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb <https://
    urldefense.com/v3/__http://nodejs_22.21.1.bb__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRCOHDgpo$>
    @@ -27,7 +27,7 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-
    v${PV}.tar.xz <https://urldefense.com/v3/__https://nodejs.org/dist/
    v$*7BPV*7D/node-v$*7BPV*7D.tar.xz__;JSUlJQ!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRlmfLbcQ$> \
                 file://system-c-ares.patch \
                 file://0001-liftoff-Correct-function-signatures.patch \
                 file://libatomic.patch \
    -           file://0001-deps-disable-io_uring-support-in-libuv.patch \
    +           ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '',
    'file://0001-deps-disable-io_uring-support-in-libuv.patch', d)} \
                 file://0001-positional-args.patch \
                 file://0001-custom-env.patch \
                 file://0001-build-remove-redundant-mXX-flags-for-V8.patch \
    -- 
    2.34.1


    -=-=-=-=-=-=-=-=-=-=-=-
    Links: You receive all messages sent to this group.
    View/Reply Online (#123364): https://lists.openembedded.org/g/
    openembedded-devel/message/123364 <https://urldefense.com/v3/
    __https://lists.openembedded.org/g/openembedded-devel/
    message/123364__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRjFU997g$>
    Mute This Topic: https://lists.openembedded.org/mt/117220566/1997914
    <https://urldefense.com/v3/__https://lists.openembedded.org/
    mt/117220566/1997914__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRbKNBBT4$>
    Group Owner: [email protected]
    <mailto:openembedded-devel%[email protected]>
    Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/
    unsub <https://urldefense.com/v3/__https://lists.openembedded.org/g/
    openembedded-devel/unsub__;!!AjveYdw8EvQ!
    atf9U9V_2svgNttYDO8_sNqJD6NpEHqRjsj18Xphq2sHlO6OmcEKalaZ5gfxD-
    urjGmwlhvcB67Rl-LRhQb1BOc$> [[email protected]
    <mailto:[email protected]>]
    -=-=-=-=-=-=-=-=-=-=-=-