-
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
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
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 <schonm@gmail.com> | ||
| 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 <schonm@gmail.com> | ||
| 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 <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 | ||
| + |
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
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 <schonm@gmail.com> | ||
| 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.