Patchwork [meta-oe,for-denzil,2/2] cloud9: add patch to make it use nodejs 0.6.x for executing scripts

login
register
mail settings
Submitter Koen Kooi
Date May 18, 2012, 7:55 a.m.
Message ID <1337327758-14968-2-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/27961/
State New, archived
Headers show

Comments

Koen Kooi - May 18, 2012, 7:55 a.m.
This matches the default nodejs version in OE

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...e-as-interpreter-for-sketches-instead-of-.patch |   29 ++++++++++++++++++++
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb      |    5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
Eric BENARD - May 18, 2012, 8:04 a.m.
Le Fri, 18 May 2012 09:55:58 +0200,
Koen Kooi <koen@dominion.thruhere.net> a écrit :

> This matches the default nodejs version in OE
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
pushed to denzil-next

Eric

Patch

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch b/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
new file mode 100644
index 0000000..b32311a
--- /dev/null
+++ b/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch
@@ -0,0 +1,29 @@ 
+From ac1953d04f3f26d6aa5d8f53a9397d3ba0e96fa3 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@circuitco.com>
+Date: Fri, 11 May 2012 15:23:02 +0000
+Subject: [PATCH] ide: use 'node' as interpreter for sketches instead of
+ argv[0]
+
+This enables running scripts with node 0.6.x instead of 0.4.x
+
+Signed-off-by: root <root@beaglebone.(none)>
+---
+ server/cloud9/ide.js |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/server/cloud9/ide.js b/server/cloud9/ide.js
+index ce782f5..6c4e0f7 100644
+--- a/server/cloud9/ide.js
++++ b/server/cloud9/ide.js
+@@ -53,7 +53,7 @@ var Ide = module.exports = function(options, httpServer, exts, socket) {
+     };
+ 
+     this.$users = {};
+-    this.nodeCmd = process.argv[0];
++    this.nodeCmd = "node";
+ 
+     var davOptions = {
+         node: this.options.mountDir,
+-- 
+1.7.7
+
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index 4815a34..0f0c09c 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -3,7 +3,7 @@  HOMEPAGE = "http://c9.io"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
 DEPENDS = "libxml2 nodejs-native"
 
@@ -33,6 +33,7 @@  SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            file://index.js \
            file://cloud9.service \
            file://cloud9-avahi.service \
+           file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
           "
 
 SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed"
@@ -102,7 +103,7 @@  FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
                     ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
                    "
 
-RDEPENDS_${PN} = "nodejs4 gzip"
+RDEPENDS_${PN} = "nodejs4 nodejs gzip"
 
 inherit systemd