Skip to content

Commit c4829fa

Browse files
ArchanaWindkraj
authored andcommitted
Nodejs - Upgrade to 16.18.1
* Drop Openssl legacy provider patch and install both binaries patch which are already available in 16.x * Refresh native binaries patch against 16.x base Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 172c707 commit c4829fa

6 files changed

Lines changed: 27 additions & 268 deletions

File tree

meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.14/oe-npm-cache renamed to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.18/oe-npm-cache

File renamed without changes.

meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.14.bb renamed to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.18.bb

File renamed without changes.

meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch renamed to meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,34 @@ From: Guillaume Burel <guillaume.burel@stormshield.eu>
33
Date: Fri, 3 Jan 2020 11:25:54 +0100
44
Subject: [PATCH] Using native binaries
55

6+
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
67
---
7-
node.gyp | 4 ++--
8-
tools/v8_gypfiles/v8.gyp | 11 ++++-------
9-
2 files changed, 6 insertions(+), 9 deletions(-)
8+
node.gyp | 2 ++
9+
tools/v8_gypfiles/v8.gyp | 5 +++++
10+
2 files changed, 7 insertions(+)
1011

12+
diff --git a/node.gyp b/node.gyp
13+
index 24505da7ba..7d41bd52db 100644
1114
--- a/node.gyp
1215
+++ b/node.gyp
13-
@@ -294,6 +294,7 @@
16+
@@ -319,6 +319,7 @@
1417
'action_name': 'run_mkcodecache',
1518
'process_outputs_as_sources': 1,
1619
'inputs': [
1720
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
1821
'<(mkcodecache_exec)',
1922
],
2023
'outputs': [
21-
@@ -319,6 +320,7 @@
22-
'action_name': 'node_mksnapshot',
23-
'process_outputs_as_sources': 1,
24-
'inputs': [
25-
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
26-
'<(node_mksnapshot_exec)',
27-
],
28-
'outputs': [
24+
@@ -366,6 +367,7 @@
25+
'action_name': 'node_mksnapshot',
26+
'process_outputs_as_sources': 1,
27+
'inputs': [
28+
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
29+
'<(node_mksnapshot_exec)',
30+
],
31+
'outputs': [
32+
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
33+
index ed042f8829..371b8e02c2 100644
2934
--- a/tools/v8_gypfiles/v8.gyp
3035
+++ b/tools/v8_gypfiles/v8.gyp
3136
@@ -68,6 +68,7 @@
@@ -40,31 +45,34 @@ Subject: [PATCH] Using native binaries
4045
'<@(torque_outputs_inc)',
4146
],
4247
'action': [
43-
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
48+
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
4449
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
4550
'-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
4651
'-v8-root', '<(V8_ROOT)',
47-
@@ -225,6 +227,7 @@
52+
@@ -211,6 +213,7 @@
4853
{
4954
'action_name': 'generate_bytecode_builtins_list_action',
5055
'inputs': [
5156
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
5257
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)bytecode_builtins_list_generator<(EXECUTABLE_SUFFIX)',
5358
],
5459
'outputs': [
55-
@@ -415,6 +418,7 @@
60+
@@ -395,6 +398,7 @@
5661
],
5762
},
5863
'inputs': [
5964
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
6065
'<(mksnapshot_exec)',
6166
],
6267
'outputs': [
63-
@@ -1548,6 +1552,7 @@
68+
@@ -1513,6 +1517,7 @@
6469
{
6570
'action_name': 'run_gen-regexp-special-case_action',
6671
'inputs': [
6772
+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh',
6873
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen-regexp-special-case<(EXECUTABLE_SUFFIX)',
6974
],
7075
'outputs': [
76+
--
77+
2.34.1
78+

meta-oe/recipes-devtools/nodejs/nodejs/0002-Install-both-binaries-and-use-libdir.patch

Lines changed: 0 additions & 96 deletions
This file was deleted.

meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch

Lines changed: 0 additions & 151 deletions
This file was deleted.

meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb renamed to meta-oe/recipes-devtools/nodejs/nodejs_16.18.1.bb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
22
HOMEPAGE = "http://nodejs.org"
33
LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0"
4-
LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba5b21ac7a505195ca69344d3d7a94a"
4+
LIC_FILES_CHKSUM = "file://LICENSE;md5=6e54852cd826c41e80c6d80f6db00a85"
55

66
DEPENDS = "openssl"
77
DEPENDS:append:class-target = " qemu-native"
@@ -19,25 +19,23 @@ COMPATIBLE_HOST:powerpc = "null"
1919

2020
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
2121
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
22-
file://0002-Install-both-binaries-and-use-libdir.patch \
2322
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
24-
file://0005-add-openssl-legacy-provider-option.patch \
2523
file://big-endian.patch \
2624
file://mips-less-memory.patch \
2725
file://system-c-ares.patch \
2826
file://0001-liftoff-Correct-function-signatures.patch \
2927
file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
3028
"
3129
SRC_URI:append:class-target = " \
32-
file://0002-Using-native-binaries.patch \
30+
file://0001-Using-native-binaries.patch \
3331
"
3432
SRC_URI:append:toolchain-clang:x86 = " \
3533
file://libatomic.patch \
3634
"
3735
SRC_URI:append:toolchain-clang:powerpc64le = " \
3836
file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
3937
"
40-
SRC_URI[sha256sum] = "e922e215cc68eb5f94d33e8a0b61e2c863b7731cc8600ab955d3822da90ff8d1"
38+
SRC_URI[sha256sum] = "1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238"
4139

4240
S = "${WORKDIR}/node-v${PV}"
4341

0 commit comments

Comments
 (0)