Skip to content

Commit

Permalink
nodejs: update patch to apply on new 16.11.1 version
Browse files Browse the repository at this point in the history
:Release Notes:

:Detailed Notes:
Fixes:
ERROR: nodejs-16.11.1-r0 do_patch: Fuzz detected:

Applying patch 0001-Use-human-readable-process-name-for-chrome-inspector.patch
patching file src/inspector_io.cc
patching file src/node_internals.h
Hunk #1 succeeded at 91 with fuzz 2 (offset -9 lines).
patching file src/util.cc
Hunk #1 succeeded at 164 (offset 3 lines).

The context lines in the patches can be updated with devtool:

    devtool modify nodejs
    devtool finish --force-patch-refresh nodejs <layer_path>

Don't forget to review changes done by devtool!

ERROR: nodejs-16.11.1-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRO-12999] CCC: Upgrade to Yocto 4.0 Kirkstone
[WRN-9820] Create GPVB with Yocto 4.0 Kirkstone

Change-Id: Ib50c21832da969b33c0f20e9f41bbe4e27901ad3
  • Loading branch information
shr-project authored and Hyunjae Shin committed Oct 6, 2022
1 parent 50ae758 commit cd95de1
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 14c46bc060a4e6121e475076b7adba294431d5be Mon Sep 17 00:00:00 2001
From 6986446a63eb23d834054660a77ead3772691088 Mon Sep 17 00:00:00 2001
From: "sungmok.shin" <[email protected]>
Date: Wed, 19 Aug 2020 09:50:56 +0900
Subject: [PATCH] Use human readable process name for chrome inspector
Expand Down Expand Up @@ -35,7 +35,7 @@ https://github.com/nodejs/node/pull/31633
3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/inspector_io.cc b/src/inspector_io.cc
index 75290317d2..4cf2842624 100644
index 5868289a..9baf1e60 100644
--- a/src/inspector_io.cc
+++ b/src/inspector_io.cc
@@ -362,7 +362,11 @@ std::vector<std::string> InspectorIoDelegate::GetTargetIds() {
Expand All @@ -52,22 +52,22 @@ index 75290317d2..4cf2842624 100644

std::string InspectorIoDelegate::GetTargetUrl(const std::string& id) {
diff --git a/src/node_internals.h b/src/node_internals.h
index c1555b312e..6508a70ea9 100644
index dec024bd..d9531dca 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -100,6 +100,7 @@ void RegisterSignalHandler(int signal,
@@ -91,6 +91,7 @@ void SignalExit(int signal, siginfo_t* info, void* ucontext);

std::string GetProcessTitle(const char* default_title);
std::string GetHumanReadableProcessName();
+std::string GetHumanReadableProcessNameWithoutPID();

void InitializeContextRuntime(v8::Local<v8::Context>);
v8::Maybe<bool> InitializeContextRuntime(v8::Local<v8::Context> context);
bool InitializePrimordials(v8::Local<v8::Context> context);
diff --git a/src/util.cc b/src/util.cc
index c604c4c955..42846e673f 100644
index bae5a47a..7ea4e4bc 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -161,6 +161,10 @@ std::string GetHumanReadableProcessName() {
@@ -164,6 +164,10 @@ std::string GetHumanReadableProcessName() {
return SPrintF("%s[%d]", GetProcessTitle("Node.js"), uv_os_getpid());
}

Expand Down

0 comments on commit cd95de1

Please sign in to comment.