[ptxdist] [PATCH] nodejs: version bump 12.14.1 LTS -> 12.16.1 LTS

[ptxdist] [PATCH] nodejs: version bump 12.14.1 LTS -> 12.16.1 LTS

[Ulrich Ölmann]

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
 .../0001-Disable-running-gyp-on-shared-deps.patch    |  2 +-
 .../0002-Install-both-binaries-and-use-libdir.patch  | 12 ++++++------
 ...not-explicitely-set-an-rpath-in-make-genera.patch |  0
 patches/{node-v12.14.1 => node-v12.16.1}/series      |  0
 rules/nodejs.make                                    |  4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename patches/{node-v12.14.1 => node-v12.16.1}/0001-Disable-running-gyp-on-shared-deps.patch (94%)
 rename patches/{node-v12.14.1 => node-v12.16.1}/0002-Install-both-binaries-and-use-libdir.patch (90%)
 rename patches/{node-v12.14.1 => node-v12.16.1}/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch (100%)
 rename patches/{node-v12.14.1 => node-v12.16.1}/series (100%)

diff --git a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
similarity index 94%
rename from patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
rename to patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
index b41095a20e97..f1d6bb737198 100644
--- a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
+++ b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Disable running gyp on shared deps
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 56f53582d1f4..f289f258df6f 100644
+index 05eaa73abbe0..965e4f8560e6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -141,7 +141,7 @@ test-code-cache: with-code-cache
diff --git a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
similarity index 90%
rename from patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
rename to patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
index 38c3c96503f1..b9dc62bb493f 100644
--- a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
+++ b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
@@ -12,10 +12,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  2 files changed, 21 insertions(+), 17 deletions(-)
 
 diff --git a/configure.py b/configure.py
-index 20cce214dbb1..e2d78a2a51ef 100755
+index 14f5665e0299..36a8a413713a 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -559,6 +559,12 @@ parser.add_option('--shared',
+@@ -572,6 +572,12 @@ parser.add_option('--shared',
      help='compile shared library for embedding node in another project. ' +
           '(This mode is not officially supported for regular applications)')
  
@@ -28,14 +28,14 @@ index 20cce214dbb1..e2d78a2a51ef 100755
  parser.add_option('--without-v8-platform',
      action='store_true',
      dest='without_v8_platform',
-@@ -1103,6 +1109,7 @@ def configure_node(o):
-   if o['variables']['want_separate_host_toolset'] == 0:
-     o['variables']['node_code_cache'] = 'yes' # For testing
+@@ -1121,6 +1127,7 @@ def configure_node(o):
+   o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
+ 
    o['variables']['node_shared'] = b(options.shared)
 +  o['variables']['libdir'] = options.libdir
    node_module_version = getmoduleversion.get_version()
  
-   if sys.platform == 'darwin':
+   if options.dest_os == 'android':
 diff --git a/tools/install.py b/tools/install.py
 index 655802980a6e..fe4723bf1501 100755
 --- a/tools/install.py
diff --git a/patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch b/patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
similarity index 100%
rename from patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
rename to patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
diff --git a/patches/node-v12.14.1/series b/patches/node-v12.16.1/series
similarity index 100%
rename from patches/node-v12.14.1/series
rename to patches/node-v12.16.1/series
diff --git a/rules/nodejs.make b/rules/nodejs.make
index a9433bd0687a..26335200cfb4 100644
--- a/rules/nodejs.make
+++ b/rules/nodejs.make
@@ -17,8 +17,8 @@ endif
 #
 # Paths and names
 #
-NODEJS_VERSION		:= v12.14.1
-NODEJS_MD5		:= 1c78a75f5c95321f533ecccca695e814
+NODEJS_VERSION		:= v12.16.1
+NODEJS_MD5		:= 549582c075072c689c245ba12ecac54a
 NODEJS			:= node-$(NODEJS_VERSION)
 NODEJS_SUFFIX		:= tar.xz
 NODEJS_URL		:= http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
-- 
2.26.0.rc2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] nodejs: expand and fix license

[Michael Olbrich]

The new version added a instance of the MIT license.
Not all of the components listed in the LICENSE are used (external
dependencies instead of internal ones and other unused stuff). But some of
them are relevant, such as BSD-3-Clause for v8 and ISC of other smaller
stuff.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
Hi,

So, the list of licenses is a bit longer.

Ulrich, can you take a look at this and see if anything else should be
added?
Michael

 rules/nodejs.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/nodejs.make b/rules/nodejs.make
index 26335200cfb4..2330e98a377a 100644
--- a/rules/nodejs.make
+++ b/rules/nodejs.make
@@ -24,9 +24,9 @@ NODEJS_SUFFIX		:= tar.xz
 NODEJS_URL		:= http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
 NODEJS_SOURCE		:= $(SRCDIR)/$(NODEJS).$(NODEJS_SUFFIX)
 NODEJS_DIR		:= $(BUILDDIR)/$(NODEJS)
-NODEJS_LICENSE		:= MIT
+NODEJS_LICENSE		:= MIT AND ISC AND BSD-3-Clause
 NODEJS_LICENSE_FILES	:= \
-        file://LICENSE;md5=be4d5107c64dc3d7c57e3797e1a0674b
+        file://LICENSE;md5=126890df35936bbffe9fa00c90ad4870
 
 NODEJS_HOST_TOOLS	:= \
 	bytecode_builtins_list_generator \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] nodejs: version bump 12.14.1 LTS -> 12.16.1 LTS

[Michael Olbrich]

Thanks, applied as 866fae6c76146762cf3e9a233f8a16ac08d7d28d.

Michael

[sent from post-receive hook]

On Wed, 01 Apr 2020 17:06:43 +0200, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> ---
>  .../0001-Disable-running-gyp-on-shared-deps.patch    |  2 +-
>  .../0002-Install-both-binaries-and-use-libdir.patch  | 12 ++++++------
>  ...not-explicitely-set-an-rpath-in-make-genera.patch |  0
>  patches/{node-v12.14.1 => node-v12.16.1}/series      |  0
>  rules/nodejs.make                                    |  4 ++--
>  5 files changed, 9 insertions(+), 9 deletions(-)
>  rename patches/{node-v12.14.1 => node-v12.16.1}/0001-Disable-running-gyp-on-shared-deps.patch (94%)
>  rename patches/{node-v12.14.1 => node-v12.16.1}/0002-Install-both-binaries-and-use-libdir.patch (90%)
>  rename patches/{node-v12.14.1 => node-v12.16.1}/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch (100%)
>  rename patches/{node-v12.14.1 => node-v12.16.1}/series (100%)
> 
> diff --git a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
> similarity index 94%
> rename from patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
> rename to patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
> index b41095a20e97..f1d6bb737198 100644
> --- a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
> +++ b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
> @@ -7,7 +7,7 @@ Subject: [PATCH] Disable running gyp on shared deps
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/Makefile b/Makefile
> -index 56f53582d1f4..f289f258df6f 100644
> +index 05eaa73abbe0..965e4f8560e6 100644
>  --- a/Makefile
>  +++ b/Makefile
>  @@ -141,7 +141,7 @@ test-code-cache: with-code-cache
> diff --git a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
> similarity index 90%
> rename from patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
> rename to patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
> index 38c3c96503f1..b9dc62bb493f 100644
> --- a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
> +++ b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
> @@ -12,10 +12,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
>   2 files changed, 21 insertions(+), 17 deletions(-)
>  
>  diff --git a/configure.py b/configure.py
> -index 20cce214dbb1..e2d78a2a51ef 100755
> +index 14f5665e0299..36a8a413713a 100755
>  --- a/configure.py
>  +++ b/configure.py
> -@@ -559,6 +559,12 @@ parser.add_option('--shared',
> +@@ -572,6 +572,12 @@ parser.add_option('--shared',
>       help='compile shared library for embedding node in another project. ' +
>            '(This mode is not officially supported for regular applications)')
>   
> @@ -28,14 +28,14 @@ index 20cce214dbb1..e2d78a2a51ef 100755
>   parser.add_option('--without-v8-platform',
>       action='store_true',
>       dest='without_v8_platform',
> -@@ -1103,6 +1109,7 @@ def configure_node(o):
> -   if o['variables']['want_separate_host_toolset'] == 0:
> -     o['variables']['node_code_cache'] = 'yes' # For testing
> +@@ -1121,6 +1127,7 @@ def configure_node(o):
> +   o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
> + 
>     o['variables']['node_shared'] = b(options.shared)
>  +  o['variables']['libdir'] = options.libdir
>     node_module_version = getmoduleversion.get_version()
>   
> -   if sys.platform == 'darwin':
> +   if options.dest_os == 'android':
>  diff --git a/tools/install.py b/tools/install.py
>  index 655802980a6e..fe4723bf1501 100755
>  --- a/tools/install.py
> diff --git a/patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch b/patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
> similarity index 100%
> rename from patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
> rename to patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
> diff --git a/patches/node-v12.14.1/series b/patches/node-v12.16.1/series
> similarity index 100%
> rename from patches/node-v12.14.1/series
> rename to patches/node-v12.16.1/series
> diff --git a/rules/nodejs.make b/rules/nodejs.make
> index a9433bd0687a..26335200cfb4 100644
> --- a/rules/nodejs.make
> +++ b/rules/nodejs.make
> @@ -17,8 +17,8 @@ endif
>  #
>  # Paths and names
>  #
> -NODEJS_VERSION		:= v12.14.1
> -NODEJS_MD5		:= 1c78a75f5c95321f533ecccca695e814
> +NODEJS_VERSION		:= v12.16.1
> +NODEJS_MD5		:= 549582c075072c689c245ba12ecac54a
>  NODEJS			:= node-$(NODEJS_VERSION)
>  NODEJS_SUFFIX		:= tar.xz
>  NODEJS_URL		:= http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
> 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de