Skip to content

Commit 29fd4b2

Browse files
sfoster1sfoster1
committed
meta-opentrons: bump nodejs to 22.21
Required for electron v39 in Opentrons/opentrons#20117
1 parent a728e60 commit 29fd4b2

20 files changed

+583
-91
lines changed

‎layers/meta-opentrons/conf/distro/opentrons.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PREFERRED_VERSION_hidapi = "0.11.2"
2828
PREFERRED_VERSION_python3-pyjwt = "2.6.0"
2929
PREFERRED_VERSION_python3-setuptools = "68.2.2"
3030
PREFERRED_VERSION_python3-setuptools-scm = "8.2.1"
31-
PREFERRED_VERSION_nodejs = "22.12.0"
31+
PREFERRED_VERSION_nodejs = "22.21.1"
3232
PREFERRED_VERSION_python3-wrapt = "1.16.0"
3333
PREFERRED_VERSION_python3-setuptools-rust = "1.10.2"
3434
PREFERRED_VERSION_rust = "1.75.0"

layers/meta-opentrons/recipes-devtools/nodejs/nodejs/oe-npm-cache renamed to layers/meta-opentrons/recipes-devtools/nodejs/nodejs-oe-cache-22.21/oe-npm-cache

File renamed without changes.

layers/meta-opentrons/recipes-devtools/nodejs/nodejs-oe-cache-native_22.12.bb renamed to layers/meta-opentrons/recipes-devtools/nodejs/nodejs-oe-cache-native_22.21.bb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ SRC_URI = "\
66
file://oe-npm-cache \
77
"
88

9-
FILESEXTRAPATHS:prepend := "${THISDIR}/nodejs:"
10-
119
inherit native
1210

1311
S = "${UNPACKDIR}"

‎layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 065972799c203069befdb063f1a93f164bff12de Mon Sep 17 00:00:00 2001
1+
From 689e098cbde130ecde523ae39df3567456271fda Mon Sep 17 00:00:00 2001
22
From: Zuzana Svetlikova <zsvetlik@redhat.com>
33
Date: Thu, 27 Apr 2017 14:25:42 +0200
44
Subject: [PATCH] Disable running gyp on shared deps
@@ -33,10 +33,10 @@ do_unpack[postfuncs] += "prune_sources"
3333
1 file changed, 1 insertion(+), 1 deletion(-)
3434

3535
diff --git a/Makefile b/Makefile
36-
index 32dc4e5b..2d660354 100644
36+
index dba16e5e..da4faffc 100644
3737
--- a/Makefile
3838
+++ b/Makefile
39-
@@ -171,7 +171,7 @@ with-code-cache test-code-cache:
39+
@@ -173,7 +173,7 @@ with-code-cache test-code-cache:
4040
$(warning '$@' target is a noop)
4141

4242
out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \

‎layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Revert the patch found here https://github.com/nodejs/node/commit/fe1dd26398e1887b96b2dc51ab59371ad4d6bc20?diff=unified&w=0
2+
// so that the dependencies are still explicitly enumerated. That way we
3+
// can pick and choose which pieces to build and which to use existing system
4+
// packages for.
5+
6+
Upstream-Status: Inappropriate [embedded specific]
7+
8+
9+
--- a/Makefile 2025-01-11 14:37:29.059536707 -0500
10+
+++ b/Makefile 2025-01-11 14:39:52.419867046 -0500
11+
@@ -171,7 +171,8 @@
12+
$(warning '$@' target is a noop)
13+
14+
out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \
15+
- deps/*/*.gyp \
16+
+ deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
17+
+ deps/simdutf/simdutf.gyp deps/ada/ada.gyp deps/nbytes/nbytes.gyp \
18+
tools/v8_gypfiles/toolchain.gypi \
19+
tools/v8_gypfiles/features.gypi \
20+
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
21+
22+

‎layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ff99fd45d1d6d90c049fc71f37de3018b2a0cbeb Mon Sep 17 00:00:00 2001
1+
From 6c3ac20477a4bac643088f24df3c042e627fafa9 Mon Sep 17 00:00:00 2001
22
From: Guillaume Burel <guillaume.burel@stormshield.eu>
33
Date: Fri, 3 Jan 2020 11:25:54 +0100
44
Subject: [PATCH] Using native binaries
@@ -12,79 +12,83 @@ https://git.openembedded.org/meta-openembedded/commit/?id=feeb172d1a8bf010490d22
1212

1313
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
1414
---
15-
node.gyp | 3 +++
15+
node.gyp | 3 +
1616
tools/v8_gypfiles/v8.gyp | 5 +++++
17-
2 files changed, 8 insertions(+)
17+
2 files changed, 6 insertions(+)
1818

1919
diff --git a/node.gyp b/node.gyp
20-
index 4aa214c6..703d8245 100644
20+
index e8e1d9f9..e60ccc10 100644
2121
--- a/node.gyp
2222
+++ b/node.gyp
23-
@@ -724,6 +724,7 @@
23+
@@ -320,6 +320,7 @@
2424
'action_name': 'node_mksnapshot',
2525
'process_outputs_as_sources': 1,
2626
'inputs': [
2727
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
2828
'<(node_mksnapshot_exec)',
2929
'<(node_snapshot_main)',
3030
],
31-
@@ -1033,6 +1034,7 @@
31+
@@ -935,6 +935,7 @@
3232
'action_name': 'node_js2c',
3333
'process_outputs_as_sources': 1,
3434
'inputs': [
3535
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
3636
'<(node_js2c_exec)',
3737
'<@(library_files)',
3838
'<@(deps_files)',
39-
@@ -1042,6 +1044,7 @@
39+
@@ -944,6 +945,7 @@
4040
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
4141
],
4242
'action': [
4343
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
4444
'<(node_js2c_exec)',
4545
'<@(_outputs)',
4646
'lib',
47+
4748
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
48-
index ed565257..baaeea42 100644
49+
index 42e26cd9..bc721991 100644
4950
--- a/tools/v8_gypfiles/v8.gyp
5051
+++ b/tools/v8_gypfiles/v8.gyp
51-
@@ -81,6 +81,7 @@
52+
@@ -68,6 +68,7 @@
5253
{
5354
'action_name': 'run_torque_action',
5455
'inputs': [ # Order matters.
5556
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
5657
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
5758
'<@(torque_files)',
5859
],
59-
@@ -112,6 +113,7 @@
60+
@@ -99,6 +100,7 @@
6061
'<@(torque_outputs_inc)',
6162
],
6263
'action': [
6364
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
6465
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
6566
'-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
6667
'-v8-root', '<(V8_ROOT)',
67-
@@ -224,6 +226,7 @@
68+
@@ -211,6 +213,7 @@
6869
{
6970
'action_name': 'generate_bytecode_builtins_list_action',
7071
'inputs': [
7172
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
7273
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)bytecode_builtins_list_generator<(EXECUTABLE_SUFFIX)',
7374
],
7475
'outputs': [
75-
@@ -411,6 +414,7 @@
76+
@@ -400,6 +403,7 @@
7677
],
7778
},
7879
'inputs': [
7980
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
8081
'<(mksnapshot_exec)',
8182
],
8283
'outputs': [
83-
@@ -1843,6 +1847,7 @@
84+
@@ -1539,6 +1543,7 @@
8485
{
8586
'action_name': 'run_gen-regexp-special-case_action',
8687
'inputs': [
8788
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
8889
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen-regexp-special-case<(EXECUTABLE_SUFFIX)',
8990
],
9091
'outputs': [
92+
--
93+
2.34.1
94+

‎layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-build-remove-redundant-mXX-flags-for-V8.patch‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
From 403264c02edc2689671dbefaf032e3acb4fb713d Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
3+
Date: Sat, 19 Apr 2025 12:22:10 +0200
4+
Subject: [PATCH] build: remove redundant `-mXX` flags for V8
5+
6+
They are already set by `common.gypi`.
7+
8+
9+
Needed to build on aarch64 build hosts with clang compiler
10+
Drop it when upgrading to 0.24.x or newer.
11+
12+
Upstream-Status: Backport [https://github.com/nodejs/node/commit/403264c02edc2689671dbefaf032e3acb4fb713d]
13+
14+
PR-URL: https://github.com/nodejs/node/pull/57907
15+
Reviewed-By: James M Snell <jasnell@gmail.com>
16+
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
17+
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
18+
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
19+
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
20+
---
21+
tools/v8_gypfiles/toolchain.gypi | 91 --------------------------------
22+
1 file changed, 91 deletions(-)
23+
24+
Index: node-v22.16.0/tools/v8_gypfiles/toolchain.gypi
25+
===================================================================
26+
--- node-v22.16.0.orig/tools/v8_gypfiles/toolchain.gypi
27+
+++ node-v22.16.0/tools/v8_gypfiles/toolchain.gypi
28+
@@ -103,33 +103,6 @@
29+
# Indicates if gcmole tools are downloaded by a hook.
30+
'gcmole%': 0,
31+
},
32+
-
33+
- # [GYP] this needs to be outside of the top level 'variables'
34+
- 'conditions': [
35+
- ['host_arch=="ia32" or host_arch=="x64" or \
36+
- host_arch=="ppc" or host_arch=="ppc64" or \
37+
- host_arch=="s390x" or \
38+
- clang==1', {
39+
- 'variables': {
40+
- 'host_cxx_is_biarch%': 1,
41+
- },
42+
- }, {
43+
- 'variables': {
44+
- 'host_cxx_is_biarch%': 0,
45+
- },
46+
- }],
47+
- ['target_arch=="ia32" or target_arch=="x64" or \
48+
- target_arch=="ppc" or target_arch=="ppc64" or \
49+
- target_arch=="s390x" or clang==1', {
50+
- 'variables': {
51+
- 'target_cxx_is_biarch%': 1,
52+
- },
53+
- }, {
54+
- 'variables': {
55+
- 'target_cxx_is_biarch%': 0,
56+
- },
57+
- }],
58+
- ],
59+
'target_defaults': {
60+
'cflags!': ['-Wall', '-Wextra'],
61+
'conditions': [
62+
@@ -553,71 +526,6 @@
63+
'-mmmx', # Allows mmintrin.h for MMX intrinsics.
64+
],
65+
}],
66+
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
67+
- or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
68+
- (v8_target_arch=="arm" or v8_target_arch=="ia32" or \
69+
- v8_target_arch=="ppc")', {
70+
- 'target_conditions': [
71+
- ['_toolset=="host"', {
72+
- 'conditions': [
73+
- ['host_cxx_is_biarch==1', {
74+
- 'conditions': [
75+
- ['host_arch=="s390x"', {
76+
- 'cflags': [ '-m31' ],
77+
- 'ldflags': [ '-m31' ]
78+
- },{
79+
- 'cflags': [ '-m32' ],
80+
- 'ldflags': [ '-m32' ]
81+
- }],
82+
- ],
83+
- }],
84+
- ],
85+
- 'xcode_settings': {
86+
- 'ARCHS': [ 'i386' ],
87+
- },
88+
- }],
89+
- ['_toolset=="target"', {
90+
- 'conditions': [
91+
- ['target_cxx_is_biarch==1', {
92+
- 'conditions': [
93+
- ['host_arch=="s390x"', {
94+
- 'cflags': [ '-m31' ],
95+
- 'ldflags': [ '-m31' ]
96+
- },{
97+
- 'cflags': [ '-m32' ],
98+
- 'ldflags': [ '-m32' ],
99+
- }],
100+
- ],
101+
- }],
102+
- ],
103+
- 'xcode_settings': {
104+
- 'ARCHS': [ 'i386' ],
105+
- },
106+
- }],
107+
- ],
108+
- }],
109+
- ['(OS=="linux" or OS=="android") and \
110+
- (v8_target_arch=="x64" or v8_target_arch=="arm64" or \
111+
- v8_target_arch=="ppc64" or v8_target_arch=="s390x")', {
112+
- 'target_conditions': [
113+
- ['_toolset=="host"', {
114+
- 'conditions': [
115+
- ['host_cxx_is_biarch==1', {
116+
- 'cflags': [ '-m64' ],
117+
- 'ldflags': [ '-m64' ]
118+
- }],
119+
- ],
120+
- }],
121+
- ['_toolset=="target"', {
122+
- 'conditions': [
123+
- ['target_cxx_is_biarch==1', {
124+
- 'cflags': [ '-m64' ],
125+
- 'ldflags': [ '-m64' ],
126+
- }],
127+
- ]
128+
- }],
129+
- ],
130+
- }],
131+
['OS=="android" and v8_android_log_stdout==1', {
132+
'defines': [
133+
'V8_ANDROID_LOG_STDOUT',

‎layers/meta-opentrons/recipes-devtools/nodejs/nodejs/0001-custom-env.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bac76ed9a68c7d1f9fb50e6b5e9f3e6b6e35777e Mon Sep 17 00:00:00 2001
1+
From 9c1a31afdcf368f794b9f5378cb3fe759570f905 Mon Sep 17 00:00:00 2001
22
From: Jason Schonberg <schonm@gmail.com>
33
Date: Tue, 30 Apr 2024 21:48:33 -0400
44
Subject: [PATCH] Update to nodejs 22.0.0

0 commit comments

Comments
 (0)