Skip to contentSkip to conversation

nodejs: Make prune_sources execute at do_patch phase

PATCH Superseded [email protected] 1 participant 1 message Jan 14

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 nodejs: Make prune_sources execute at do_patch phase

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 in prune_sources when depends on libuv.

So postpone prune_sources execute at do_patch phase to fix the gap.

---
 meta-oe/recipes-devtools/nodejs/nodejs_22.22.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_22.22.0.bb +2 -2
index 443cdc430d..ea09a55cb0 100644
@@ -69,7 +69,7 @@ ARCHFLAGS:append:mips = " --v8-lite-mode"
 ARCHFLAGS:append:mipsel = " --v8-lite-mode"
 ARCHFLAGS ?= ""
 
-PACKAGECONFIG ??= "ares brotli icu zlib"
+PACKAGECONFIG ??= "ares brotli icu zlib libuv"
 
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native"
 PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native"
@@ -96,7 +96,7 @@ python prune_sources() {
     if 'zlib' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/zlib')
 }
-do_unpack[postfuncs] += "prune_sources"
+do_patch[postfuncs] += "prune_sources"
 
 # V8's JIT infrastructure requires binaries such as mksnapshot and
 # mkpeephole to be run in the host during the build. However, these
Signature · 1 line
2.34.1