Skip to contentSkip to conversation

package/nodejs: update python variable patch

PATCH New Martin Bark 2 participants 4 messages Feb 16, 2016

lore
Share & tools
lore

Martin Bark

author
#0 lore raw

PATCH 1/2 package/nodejs: update python variable patch

Update 0003-Use-a-python-variable-instead-of-hardcoding-Python.patch for v5.5.0 to include the js2c.py tool.

Fixes:
http://autobuild.buildroot.net/results/87e9bbbb36f7fe4868d238ef6a7b72eb8cca7052/
http://autobuild.buildroot.net/results/f748c0956f71a7857d5cc9ae7bfe3c14357a078a/

Signed-off-by Martin Bark <[email protected]>

---

v1 -> v2
- new in v2, split out from patch to bump node to v5.6.0
- hand crafted patch to minimise changes

Signed-off-by Martin Bark <[email protected]>
---
 ...hon-variable-instead-of-hardcoding-Python.patch | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)
package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +18 -7
index 3104644..4d8d715 100644
@@ -16,15 +16,17 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
 Signed-off-by: Martin Bark <[email protected]>
 [yann.morin.1998 at free.fr: adapt to 4.1.2]
 Signed-off-by: "Yann E. MORIN" <[email protected]>
+[Martin: adapt to 5.5.0]
+Signed-off-by: Martin Bark <[email protected]>
 ---
  deps/v8/tools/gyp/v8.gyp | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp
-index c703155..06c0b2b 100644
+index 1e5705d..e2e5dfe 100644
 --- a/deps/v8/tools/gyp/v8.gyp
 +++ b/deps/v8/tools/gyp/v8.gyp
-@@ -1696,14 +1696,14 @@
+@@ -1723,14 +1723,14 @@
                        '<(PRODUCT_DIR)/natives_blob_host.bin',
                      ],
                      'action': [

@@ -41,7 +43,7 @@ index c703155..06c0b2b 100644
                      ],
                    }],
                  ],
-@@ -1712,7 +1712,7 @@
+@@ -1739,7 +1739,7 @@
                    '<(PRODUCT_DIR)/natives_blob.bin',
                  ],
                  'action': [

@@ -50,7 +52,7 @@ index c703155..06c0b2b 100644
                  ],
                }],
              ],
-@@ -1812,7 +1812,7 @@
+@@ -1847,7 +1847,7 @@
              '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
            ],
            'action': [

@@ -59,7 +61,7 @@ index c703155..06c0b2b 100644
              '../../tools/js2c.py',
              '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
              'CORE',
-@@ -1838,7 +1838,7 @@
+@@ -1873,7 +1873,7 @@
              '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
            ],
            'action': [

@@ -68,7 +70,16 @@ index c703155..06c0b2b 100644
              '../../tools/js2c.py',
              '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
              'EXPERIMENTAL',
-@@ -1863,7 +1863,7 @@
+@@ -1898,7 +1898,7 @@
+             '<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
+           ],
+           'action': [
+-            'python',
++            '<(python)',
+             '../../tools/js2c.py',
+             '<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
+             'CODE_STUB',
+@@ -1923,7 +1923,7 @@
              '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
            ],
            'action': [

@@ -77,7 +88,7 @@ index c703155..06c0b2b 100644
              '../../tools/js2c.py',
              '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
              'EXTRAS',
-@@ -1900,7 +1900,7 @@
+@@ -1960,7 +1960,7 @@
                '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
              ],
              'action': [
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 2/2 package/nodejs: bump version to 5.6.0

This is an important security release. See
https://nodejs.org/en/blog/release/v5.6.0/ for further details

Signed-off-by Martin Bark <[email protected]>

---

v1 -> v2
- split updated 0003-Use-a-python-variable-instead-of-hardcoding-Python.patch into a separate patch because it also is needed for
v5.5.0 (Suggested by Thomas Petazzoni)

Signed-off-by Martin Bark <[email protected]>
---
 .../0001-Remove-dependency-on-Python-bz2-module.patch                 | 0
 .../{5.5.0 => 5.6.0}/0002-gyp-force-link-command-to-use-CXX.patch     | 0
 .../0003-Use-a-python-variable-instead-of-hardcoding-Python.patch     | 0
 package/nodejs/{5.5.0 => 5.6.0}/0004-Fix-va_list-not-declared.patch   | 0
 package/nodejs/{5.5.0 => 5.6.0}/0005-Fix-support-for-uClibc-ng.patch  | 0
 package/nodejs/Config.in                                              | 2 +-
 package/nodejs/nodejs.hash                                            | 4 ++--
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename package/nodejs/{5.5.0 => 5.6.0}/0001-Remove-dependency-on-Python-bz2-module.patch (100%)
 rename package/nodejs/{5.5.0 => 5.6.0}/0002-gyp-force-link-command-to-use-CXX.patch (100%)
 rename package/nodejs/{5.5.0 => 5.6.0}/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (100%)
 rename package/nodejs/{5.5.0 => 5.6.0}/0004-Fix-va_list-not-declared.patch (100%)
 rename package/nodejs/{5.5.0 => 5.6.0}/0005-Fix-support-for-uClibc-ng.patch (100%)
package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0
similarity index 100%
rename from package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch
rename to package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch
package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch +0 -0
similarity index 100%
rename from package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch
rename to package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch
package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0
similarity index 100%
rename from package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
rename to package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch renamed from package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch +0 -0
similarity index 100%
rename from package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch
rename to package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch
package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch renamed from package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch +0 -0
similarity index 100%
rename from package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch
rename to package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch
package/nodejs/Config.in +1 -1
index cdf7705..bec0eee 100644
@@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 
 config BR2_PACKAGE_NODEJS_VERSION_STRING
 	string
-	default "5.5.0"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+	default "5.6.0"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 	default "0.10.41"
 
 menu "Module Selection"
package/nodejs/nodejs.hash +2 -2
index e65f14a..ccad648 100644
@@ -1,5 +1,5 @@
 # From upstream URL: http://nodejs.org/dist/v0.10.41/SHASUMS256.txt
 sha256	79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995  node-v0.10.41.tar.gz
 
-# From upstream URL: http://nodejs.org/dist/v5.5.0/SHASUMS256.txt
-sha256  9c46b4dc9548e43826f71f6571f56e39783c456b9516045b496ea73321731e22  node-v5.5.0.tar.xz
+# From upstream URL: http://nodejs.org/dist/v5.6.0/SHASUMS256.txt
+sha256  588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3  node-v5.6.0.tar.xz
Signature · 1 line
2.5.0
Applied
#3 lore raw

PATCH 1/2 package/nodejs: update python variable patch

In reply to Martin Bark

Dear Martin Bark,

Quoted 9 lines · Martin Bark

Update 0003-Use-a-python-variable-instead-of-hardcoding-Python.patch for v5.5.0 to include the js2c.py tool.

Fixes:
http://autobuild.buildroot.net/results/87e9bbbb36f7fe4868d238ef6a7b72eb8cca7052/
http://autobuild.buildroot.net/results/f748c0956f71a7857d5cc9ae7bfe3c14357a078a/

Signed-off-by Martin Bark <[email protected]>

---

Applied to master, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com