-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
328 additions
and
232 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7d94bfe53beeb2d25eb5f2ff6b1d509df7e6ab80 Mon Sep 17 00:00:00 2001 | ||
From 689e098cbde130ecde523ae39df3567456271fda Mon Sep 17 00:00:00 2001 | ||
From: Zuzana Svetlikova <[email protected]> | ||
Date: Thu, 27 Apr 2017 14:25:42 +0200 | ||
Subject: [PATCH] Disable running gyp on shared deps | ||
|
@@ -28,24 +28,20 @@ python prune_sources() { | |
shutil.rmtree(d.getVar('S') + '/deps/zlib') | ||
} | ||
do_unpack[postfuncs] += "prune_sources" | ||
|
||
Signed-off-by: Archana Polampalli <[email protected]> | ||
--- | ||
Makefile | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/Makefile b/Makefile | ||
index 0be0659d..3c442014 100644 | ||
index dba16e5e..da4faffc 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -169,7 +169,7 @@ with-code-cache test-code-cache: | ||
@@ -173,7 +173,7 @@ with-code-cache test-code-cache: | ||
$(warning '$@' target is a noop) | ||
out/Makefile: config.gypi common.gypi node.gyp \ | ||
|
||
out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \ | ||
- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ | ||
+ deps/llhttp/llhttp.gyp \ | ||
deps/simdutf/simdutf.gyp deps/ada/ada.gyp \ | ||
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ | ||
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp | ||
-- | ||
2.40.0 | ||
deps/simdutf/simdutf.gyp deps/ada/ada.gyp deps/nbytes/nbytes.gyp \ | ||
tools/v8_gypfiles/toolchain.gypi \ | ||
tools/v8_gypfiles/features.gypi \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ https://git.openembedded.org/meta-openembedded/commit/?id=feeb172d1a8bf010490d22 | |
|
||
Signed-off-by: Archana Polampalli <[email protected]> | ||
--- | ||
node.gyp | 1 + | ||
node.gyp | 3 + | ||
tools/v8_gypfiles/v8.gyp | 5 +++++ | ||
2 files changed, 6 insertions(+) | ||
|
||
|
@@ -28,6 +28,23 @@ index e8e1d9f9..e60ccc10 100644 | |
'<(node_mksnapshot_exec)', | ||
'<(node_snapshot_main)', | ||
], | ||
@@ -935,6 +935,7 @@ | ||
'action_name': 'node_js2c', | ||
'process_outputs_as_sources': 1, | ||
'inputs': [ | ||
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', | ||
'<(node_js2c_exec)', | ||
'<@(library_files)', | ||
'<@(deps_files)', | ||
@@ -944,6 +945,7 @@ | ||
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', | ||
], | ||
'action': [ | ||
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', | ||
'<(node_js2c_exec)', | ||
'<@(_outputs)', | ||
'lib', | ||
|
||
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp | ||
index 42e26cd9..bc721991 100644 | ||
--- a/tools/v8_gypfiles/v8.gyp | ||
|
@@ -72,6 +89,5 @@ index 42e26cd9..bc721991 100644 | |
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen-regexp-special-case<(EXECUTABLE_SUFFIX)', | ||
], | ||
'outputs': [ | ||
-- | ||
2.34.1 | ||
|
||
-- | ||
2.34.1 |
18 changes: 18 additions & 0 deletions
18
layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-custom-env.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
From 9c1a31afdcf368f794b9f5378cb3fe759570f905 Mon Sep 17 00:00:00 2001 | ||
From: Jason Schonberg <[email protected]> | ||
Date: Tue, 30 Apr 2024 21:48:33 -0400 | ||
Subject: [PATCH] Update to nodejs 22.0.0 | ||
|
||
Upstream-Status: Inappropriate [embedded specific] | ||
--- | ||
test/fixtures/run-script/node_modules/.bin/custom-env | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/test/fixtures/run-script/node_modules/.bin/custom-env b/test/fixtures/run-script/node_modules/.bin/custom-env | ||
index e6f291c6..1430f2e9 100755 | ||
--- a/test/fixtures/run-script/node_modules/.bin/custom-env | ||
+++ b/test/fixtures/run-script/node_modules/.bin/custom-env | ||
@@ -1,2 +1,2 @@ | ||
-#!/bin/bash | ||
+#!/bin/sh | ||
echo "$CUSTOM_ENV" |
52 changes: 52 additions & 0 deletions
52
...pentrons/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From 2bb296f169f86dbb04ee47e9a0dc1e3ee13d4f73 Mon Sep 17 00:00:00 2001 | ||
From: Jason Schonberg <[email protected]> | ||
Date: Thu, 7 Mar 2024 12:55:56 -0500 | ||
Subject: [PATCH] Update to nodejs 20.11.1 | ||
|
||
Upstream-Status: Inappropriate [embedded specific] | ||
--- | ||
...ps-disable-io_uring-support-in-libuv.patch | 35 +++++++++++++++++++ | ||
1 file changed, 35 insertions(+) | ||
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch | ||
|
||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch | ||
new file mode 100644 | ||
index 00000000..5ac711fb | ||
--- /dev/null | ||
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch | ||
@@ -0,0 +1,35 @@ | ||
+From 9838be9c710ab4249df86726fa390232a3b6a6e7 Mon Sep 17 00:00:00 2001 | ||
+From: Changqing Li <[email protected]> | ||
+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 <[email protected]> | ||
+--- | ||
+ 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 | ||
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001 | ||
From 33393507ba8209f0d6b85b391c525b4c70807275 Mon Sep 17 00:00:00 2001 | ||
From: Khem Raj <[email protected]> | ||
Date: Wed, 20 Oct 2021 12:49:58 -0700 | ||
Subject: [PATCH] [liftoff] Correct function signatures | ||
Date: Mon, 3 Jul 2023 12:33:16 +0000 | ||
Subject: [PATCH] Correct function signatures | ||
|
||
Fixes builds on mips where clang reports an error | ||
../deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h:661:5: error: no matching member function for call to 'Move' | ||
|
@@ -13,73 +13,57 @@ Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3 | |
Signed-off-by: Archana Polampalli <[email protected]> | ||
--- | ||
deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++--- | ||
deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +- | ||
deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +- | ||
.../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +- | ||
4 files changed, 6 insertions(+), 6 deletions(-) | ||
.../src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h | 2 +- | ||
.../src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h | 2 +- | ||
3 files changed, 5 insertions(+), 5 deletions(-) | ||
|
||
diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h | ||
index 22c7f73a..db4cb168 100644 | ||
index 7cb2f500..713d16db 100644 | ||
--- a/deps/v8/src/wasm/baseline/liftoff-assembler.h | ||
+++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h | ||
@@ -646,7 +646,7 @@ class LiftoffAssembler : public TurboAssembler { | ||
@@ -681,7 +681,7 @@ class LiftoffAssembler : public MacroAssembler { | ||
void FinishCall(const ValueKindSig*, compiler::CallDescriptor*); | ||
|
||
// Move {src} into {dst}. {src} and {dst} must be different. | ||
- void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind); | ||
+ void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind kind); | ||
|
||
// Parallel register move: For a list of tuples <dst, src, kind>, move the | ||
// {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore | ||
@@ -795,8 +795,8 @@ class LiftoffAssembler : public TurboAssembler { | ||
@@ -851,8 +851,8 @@ class LiftoffAssembler : public MacroAssembler { | ||
inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset, | ||
ValueKind); | ||
|
||
- inline void Move(Register dst, Register src, ValueKind); | ||
- inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind); | ||
+ inline void Move(Register dst, Register src, ValueKind kind); | ||
+ inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind kind); | ||
|
||
inline void Spill(int offset, LiftoffRegister, ValueKind); | ||
inline void Spill(int offset, WasmValue); | ||
diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | ||
index c76fd2f4..0fffe231 100644 | ||
--- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | ||
+++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | ||
@@ -661,7 +661,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, | ||
pinned = pinned | LiftoffRegList{dst_op.rm(), src}; | ||
LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); | ||
// Save original value. | ||
- Move(tmp, src, type.value_type()); | ||
+ Move(tmp, src, type.value_type().kind()); | ||
|
||
src = tmp; | ||
pinned.set(tmp); | ||
diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | ||
index 36413545..48207337 100644 | ||
--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | ||
+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | ||
@@ -593,7 +593,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, | ||
diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h | ||
index bd59f162..56b4d70c 100644 | ||
--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h | ||
+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h | ||
@@ -672,7 +672,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, | ||
pinned.set(dst_op.rm()); | ||
LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); | ||
LiftoffRegister tmp = kScratchReg2; | ||
// Save original value. | ||
- Move(tmp, src, type.value_type()); | ||
+ Move(tmp, src, type.value_type().kind()); | ||
|
||
src = tmp; | ||
pinned.set(tmp); | ||
diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | ||
index 642a7d2a..56ffcc2a 100644 | ||
--- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | ||
+++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | ||
@@ -589,7 +589,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, | ||
diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h | ||
index a3c94af0..456e5334 100644 | ||
--- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h | ||
+++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h | ||
@@ -452,7 +452,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, | ||
pinned.set(dst_op.rm()); | ||
LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); | ||
// Save original value. | ||
- Move(tmp, src, type.value_type()); | ||
+ Move(tmp, src, type.value_type().kind()); | ||
|
||
src = tmp; | ||
pinned.set(tmp); | ||
-- | ||
2.34.1 | ||
pinned.set(tmp); |
34 changes: 0 additions & 34 deletions
34
...trons/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch
This file was deleted.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-positional-args.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
From 07ee84863fa4a9e4d5f155632478587b0acbf71a Mon Sep 17 00:00:00 2001 | ||
From: Jason Schonberg <[email protected]> | ||
Date: Tue, 30 Apr 2024 21:48:33 -0400 | ||
Subject: [PATCH] Update to nodejs 22.0.0 | ||
|
||
Upstream-Status: Inappropriate [embedded specific] | ||
--- | ||
test/fixtures/run-script/node_modules/.bin/positional-args | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/test/fixtures/run-script/node_modules/.bin/positional-args b/test/fixtures/run-script/node_modules/.bin/positional-args | ||
index 2d809237..3dc5314f 100755 | ||
--- a/test/fixtures/run-script/node_modules/.bin/positional-args | ||
+++ b/test/fixtures/run-script/node_modules/.bin/positional-args | ||
@@ -1,3 +1,3 @@ | ||
-#!/bin/bash | ||
+#!/bin/sh | ||
echo "Arguments: '$@'" | ||
echo "The total number of arguments are: $#" |
23 changes: 0 additions & 23 deletions
23
...ntrons/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.