Patchwork [meta-oe,03/10] cloud9 0.5.1: use nodejs4 instead of nodejs

login
register
mail settings
Submitter Koen Kooi
Date April 9, 2012, 3:16 p.m.
Message ID <1333984573-28464-3-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/25433/
State Accepted
Commit da0fb166a41bdbcfd6c902389c919a278ba31477
Headers show

Comments

Koen Kooi - April 9, 2012, 3:16 p.m.
This allows using nodejs 0.6.x for apps, but running cloud9 using node4

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../recipes-devtools/cloud9/cloud9/cloud9.service  |    2 +-
 meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
index 027d03a..714b465 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
+++ b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
@@ -3,7 +3,7 @@  Description=Cloud9 IDE
 ConditionPathExists=|/var/lib/cloud9
 
 [Service]
-ExecStart=/usr/bin/node /usr/share/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000
+ExecStart=/usr/bin/node4 /usr/share/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
index 8a3f206..4f74edb 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
 DEPENDS = "libxml2 nodejs-native"
 
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
@@ -90,7 +90,7 @@  do_install () {
 
  touch ${D}${bindir}/cloud9
  echo "#!/bin/sh" > ${D}${bindir}/cloud9
- echo "node ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9
+ echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9
  chmod 0755 ${D}${bindir}/cloud9
 
  install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml
@@ -106,7 +106,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} = "nodejs gzip"
+RDEPENDS_${PN} = "nodejs4 gzip"
 
 inherit systemd