diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-18 07:55:58 +0000 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2012-05-18 10:03:17 +0200 |
commit | 6c0ca58ecd44d5f9048bb1972c534bca48667dad (patch) | |
tree | 0c3add344f628f267187b452f6df532fcdf894ae | |
parent | 11c2d36167d08735c8594bba116b6b0083d0cec0 (diff) |
cloud9: add patch to make it use nodejs 0.6.x for executing scriptsdenzil-next
This matches the default nodejs version in OE
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r-- | meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 5 |
2 files changed, 32 insertions, 2 deletions
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 |