Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches
@ 2017-01-08 22:42 Peter Korsgaard
  2017-01-08 22:42 ` [Buildroot] [PATCH 2/2] nodejs: bump to version 6.9.4 Peter Korsgaard
  2017-01-09  8:43 ` [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches Peter Korsgaard
  0 siblings, 2 replies; 4+ messages in thread
From: Peter Korsgaard @ 2017-01-08 22:42 UTC (permalink / raw)
  To: buildroot

Commit 3fd9c062e (nodejs: bump to version 6.9.2) bumped the 6.x version but
forgot to rename the patch directory, so the patches were no longer used.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../nodejs/{6.9.1 => 6.9.2}/0001-gyp-force-link-command-to-use-CXX.patch  | 0
 .../0002-inspector-don-t-build-when-ssl-support-is-disabled.patch         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/nodejs/{6.9.1 => 6.9.2}/0001-gyp-force-link-command-to-use-CXX.patch (100%)
 rename package/nodejs/{6.9.1 => 6.9.2}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%)

diff --git a/package/nodejs/6.9.1/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch
similarity index 100%
rename from package/nodejs/6.9.1/0001-gyp-force-link-command-to-use-CXX.patch
rename to package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch
diff --git a/package/nodejs/6.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
similarity index 100%
rename from package/nodejs/6.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
rename to package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
-- 
2.11.0

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] nodejs: bump to version 6.9.4
  2017-01-08 22:42 [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches Peter Korsgaard
@ 2017-01-08 22:42 ` Peter Korsgaard
  2017-01-09 10:42   ` Peter Korsgaard
  2017-01-09  8:43 ` [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches Peter Korsgaard
  1 sibling, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2017-01-08 22:42 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../{6.9.2 => 6.9.4}/0001-gyp-force-link-command-to-use-CXX.patch     | 0
 .../0002-inspector-don-t-build-when-ssl-support-is-disabled.patch     | 0
 package/nodejs/Config.in                                              | 2 +-
 package/nodejs/nodejs.hash                                            | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename package/nodejs/{6.9.2 => 6.9.4}/0001-gyp-force-link-command-to-use-CXX.patch (100%)
 rename package/nodejs/{6.9.2 => 6.9.4}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%)

diff --git a/package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch
similarity index 100%
rename from package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch
rename to package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch
diff --git a/package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
similarity index 100%
rename from package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
rename to package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 5c4ee122c..d2262beb9 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 
 config BR2_PACKAGE_NODEJS_VERSION_STRING
 	string
-	default "6.9.2"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+	default "6.9.4"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 	default "0.10.48"
 
 config BR2_PACKAGE_NODEJS_NPM
diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash
index 67d0258a6..8c8c5a3c2 100644
--- a/package/nodejs/nodejs.hash
+++ b/package/nodejs/nodejs.hash
@@ -1,5 +1,5 @@
 # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt
 sha256  365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e  node-v0.10.48.tar.xz
 
-# From upstream URL: http://nodejs.org/dist/v6.9.2/SHASUMS256.txt
-sha256  f41b320b37ce23a34dbc597040e71535ea4f6baa2342bc526bb45f5f9aa9c9fb  node-v6.9.2.tar.xz
+# From upstream URL: http://nodejs.org/dist/v6.9.4/SHASUMS256.txt
+sha256  c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35  node-v6.9.4.tar.xz
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches
  2017-01-08 22:42 [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches Peter Korsgaard
  2017-01-08 22:42 ` [Buildroot] [PATCH 2/2] nodejs: bump to version 6.9.4 Peter Korsgaard
@ 2017-01-09  8:43 ` Peter Korsgaard
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2017-01-09  8:43 UTC (permalink / raw)
  To: buildroot

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Commit 3fd9c062e (nodejs: bump to version 6.9.2) bumped the 6.x version but
 > forgot to rename the patch directory, so the patches were no longer used.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] nodejs: bump to version 6.9.4
  2017-01-08 22:42 ` [Buildroot] [PATCH 2/2] nodejs: bump to version 6.9.4 Peter Korsgaard
@ 2017-01-09 10:42   ` Peter Korsgaard
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2017-01-09 10:42 UTC (permalink / raw)
  To: buildroot

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-01-09 10:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-08 22:42 [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches Peter Korsgaard
2017-01-08 22:42 ` [Buildroot] [PATCH 2/2] nodejs: bump to version 6.9.4 Peter Korsgaard
2017-01-09 10:42   ` Peter Korsgaard
2017-01-09  8:43 ` [Buildroot] [PATCH 1/2] nodejs: re-add 6.x patches Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox