mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-21 05:57:05 +00:00
nodejs: upgrade 20.11.0 -> 20.11.1
Drop patches for revert io_uring support in libuv: 0001-Revert-io_uring-changes-from-libuv-1.46.0.patch 0002-Revert-io_uring-changes-from-libuv-1.45.0.patch Change to just always disable io_uring in libuv, in this way, we don't have to pick out io_uring related changes and revert them when internal libuv upgraded. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-3414
File diff suppressed because it is too large
Load Diff
+35
@@ -0,0 +1,35 @@
|
|||||||
|
From 9838be9c710ab4249df86726fa390232a3b6a6e7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Changqing Li <changqing.li@windriver.com>
|
||||||
|
Date: Fri, 1 Mar 2024 15:46:11 +0800
|
||||||
|
Subject: [PATCH] deps: disable io_uring support in libuv
|
||||||
|
|
||||||
|
Refer [1], Pseudo fails to intercept some of the syscalls when io_uring
|
||||||
|
enabled. Refer [2], always disable io_uring support in libuv to fix
|
||||||
|
issue in [1].
|
||||||
|
|
||||||
|
[1] https://git.openembedded.org/meta-openembedded/commit/?id=d08453978c31ee41d28206c6ff198d7d9d701d88
|
||||||
|
[2] https://github.com/nodejs/node/commit/686da19abb
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe specific]
|
||||||
|
|
||||||
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||||
|
---
|
||||||
|
deps/uv/src/unix/linux.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c
|
||||||
|
index 0c997185..7508409d 100644
|
||||||
|
--- a/deps/uv/src/unix/linux.c
|
||||||
|
+++ b/deps/uv/src/unix/linux.c
|
||||||
|
@@ -433,7 +433,7 @@ static int uv__use_io_uring(void) {
|
||||||
|
if (use == 0) {
|
||||||
|
/* Disable io_uring by default due to CVE-2024-22017. */
|
||||||
|
val = getenv("UV_USE_IO_URING");
|
||||||
|
- use = val != NULL && atoi(val) ? 1 : -1;
|
||||||
|
+ use = 0;
|
||||||
|
atomic_store_explicit(&use_io_uring, use, memory_order_relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
-1803
File diff suppressed because it is too large
Load Diff
+2
-3
@@ -24,8 +24,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
|
|||||||
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
|
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
|
||||||
file://system-c-ares.patch \
|
file://system-c-ares.patch \
|
||||||
file://0001-liftoff-Correct-function-signatures.patch \
|
file://0001-liftoff-Correct-function-signatures.patch \
|
||||||
file://0001-Revert-io_uring-changes-from-libuv-1.46.0.patch \
|
file://0001-deps-disable-io_uring-support-in-libuv.patch \
|
||||||
file://0002-Revert-io_uring-changes-from-libuv-1.45.0.patch \
|
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
@@ -38,7 +37,7 @@ SRC_URI:append:toolchain-clang:x86 = " \
|
|||||||
SRC_URI:append:toolchain-clang:powerpc64le = " \
|
SRC_URI:append:toolchain-clang:powerpc64le = " \
|
||||||
file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
|
file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "31807ebeeeb049c53f1765e4a95aed69476a4b696dd100cb539ab668d7950b40"
|
SRC_URI[sha256sum] = "77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e"
|
||||||
|
|
||||||
S = "${WORKDIR}/node-v${PV}"
|
S = "${WORKDIR}/node-v${PV}"
|
||||||
|
|
||||||
Reference in New Issue
Block a user