[meta-oe][PATCHv3 1/5] python-tornado: update to top of 2.2 branch

[meta-oe][PATCHv3 1/5] python-tornado: update to top of 2.2 branch

[Koen Kooi]

Drags in a few bugfixes needed for gateone

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-devtools/python/python-tornado_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/python/python-tornado_git.bb b/meta-oe/recipes-devtools/python/python-tornado_git.bb
index 00d0bbb..f158923 100644
--- a/meta-oe/recipes-devtools/python/python-tornado_git.bb
+++ b/meta-oe/recipes-devtools/python/python-tornado_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Tornado is an open source version of the scalable, non-blocking w
 LICENSE = "Apache"
 LIC_FILES_CHKSUM = "file://README;md5=e7fb9954003d7cd93322ccf282210d1c"
 
-PV = "2.2"
-SRCREV = "02bc76155de5bf4dca243e4d0c019c0ac4c8b3be"
-PR = "r1"
+PV = "2.2.1+git${SRCPV}"
+
+SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505"
 SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \
            file://0001-disable-AI_ADDRCONFIG-flag.patch \
           "
-- 
1.8.1.4

[meta-oe][PATCHv3 2/5] gateone: fix html5 feature check

[Koen Kooi]

The BlobBuilder and Blob checks never succeeded, even on cutting edge browsers. Nudge SRCREV forward to drag in those fixes.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-connectivity/gateone/gateone_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index 652876f..e9c182d 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
 
-PR = "r9"
+PR = "r10"
 
 PV = "1.1"
-SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46"
+SRCREV = "ea5db3dcb3bbbe445ae6d1a5611c1f8d547c57b9"
 SRC_URI = "git://github.com/liftoff/GateOne.git \
            file://gateone-avahi.service \
            file://server.conf \
-- 
1.8.1.4

[meta-oe][PATCHv3 3/5] nodejs4: reinstate installing all the files

[Koen Kooi]

Cloud9 needs the headers to build the o3-xml binary, using 0.8.x headers makes it crash.

This installs everything namespaced as 'node4' to avoid collisions.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
index 522b539..58ca135 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
@@ -28,8 +28,20 @@ do_compile () {
 }
 
 do_install () {
-  install -d ${D}${bindir}
-  install -m 0755 build/default/node ${D}${bindir}/node4
-}
+  DESTDIR=${D} oe_runmake install
+
+  # fix namespace conflicts with other nodejs recipes
+  mv ${D}${bindir}/node ${D}${bindir}/node4
+  mv ${D}${bindir}/node-waf ${D}${bindir}/node4-waf
+
+  mv ${D}${includedir}/node ${D}${includedir}/node4
 
+  mv ${D}${libdir}/node ${D}${libdir}/node4
+  mv ${D}${libdir}/pkgconfig/nodejs.pc ${D}${libdir}/pkgconfig/nodejs4.pc
+  sed -i -e s:include/node:include/node4: ${D}${libdir}/pkgconfig/nodejs4.pc
+
+  mv ${D}${datadir}/man/man1/node.1 ${D}${datadir}/man/man1/node4.1
+}
 
+FILES_${PN} += "${libdir}/node4/wafadmin"
+BBCLASSEXTEND = "native"
-- 
1.8.1.4

[meta-oe][PATCHv3 4/5] cloud9: use node4 to build o3-xml binary

[Koen Kooi]

Using node 0.8.x will make it crash at runtime

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

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index a78c653..0c07b12 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
 PR = "r2"
 
-DEPENDS = "libxml2 nodejs-native"
+# Nodejs-native for node-waf, nodejs4-native for the headers
+DEPENDS = "libxml2 nodejs-native nodejs4-native"
 
 SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
@@ -68,11 +69,11 @@ do_configure () {
  node-waf -vv configure
 }
 
-EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node -fPIC -DPIC"
+EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node4 -fPIC -DPIC"
 
 do_compile () {
  cd ${WORKDIR}/o3
- node tools/gluegen.js
+ node4 tools/gluegen.js
  cd hosts
  ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc
  ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc
-- 
1.8.1.4

[meta-oe][PATCHv3 5/5] nodejs 8.8.18: unset RDEPENDS for native builds

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
index 3ab2ed6..2db9e68 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
@@ -36,6 +36,7 @@ do_install () {
 }
 
 RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
+RDEPENDS_${PN}_class-native = ""
 
 FILES_${PN} += "${libdir}/node/wafadmin ${libdir}/node_modules ${libdir}/dtrace"
 BBCLASSEXTEND = "native"
-- 
1.8.1.4

Re: [meta-oe][PATCHv3 5/5] nodejs 8.8.18: unset RDEPENDS for native builds

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

On Fri, Apr 12, 2013 at 12:04:47PM +0200, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
> index 3ab2ed6..2db9e68 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
> @@ -36,6 +36,7 @@ do_install () {
>  }
>  
>  RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
> +RDEPENDS_${PN}_class-native = ""

Sorry if I caused problems by removing it before, why is this needed? 
I haven't seen any issues without it.

Also we have patch to upgrade nodejs to 0.10.0, do you know if other
components using nodejs are compatible with it? We'll also need to add
node-gyp if that's useful for someone else too.

Cheers,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe][PATCHv3 5/5] nodejs 8.8.18: unset RDEPENDS for native builds

[Koen Kooi]

Op 12 apr. 2013, om 12:30 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:

> On Fri, Apr 12, 2013 at 12:04:47PM +0200, Koen Kooi wrote:
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 1 +
>> 1 file changed, 1 insertion(+)
>> 
>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
>> index 3ab2ed6..2db9e68 100644
>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
>> @@ -36,6 +36,7 @@ do_install () {
>> }
>> 
>> RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
>> +RDEPENDS_${PN}_class-native = ""
> 
> Sorry if I caused problems by removing it before, why is this needed? 
> I haven't seen any issues without it.

You can't do DEPENDS = nodejs-native without this line, since python-shell has non -native variant

> Also we have patch to upgrade nodejs to 0.10.0, do you know if other
> components using nodejs are compatible with it?

Not sure, I haven't used node 0.10.0 yet. Otavio and I need to get serious and start meta-node real soon now :)

> We'll also need to add
> node-gyp if that's useful for someone else too.

Yes, I foresee needing it myself :)

regards,

Koen

> 
> Cheers,
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [meta-oe][PATCHv3 1/5] python-tornado: update to top of 2.2 branch

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

On Fri, Apr 12, 2013 at 12:04:43PM +0200, Koen Kooi wrote:
> Drags in a few bugfixes needed for gateone

All 5 merged + fix for nodejs4 install on dash

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta-oe/recipes-devtools/python/python-tornado_git.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-devtools/python/python-tornado_git.bb b/meta-oe/recipes-devtools/python/python-tornado_git.bb
> index 00d0bbb..f158923 100644
> --- a/meta-oe/recipes-devtools/python/python-tornado_git.bb
> +++ b/meta-oe/recipes-devtools/python/python-tornado_git.bb
> @@ -2,9 +2,9 @@ DESCRIPTION = "Tornado is an open source version of the scalable, non-blocking w
>  LICENSE = "Apache"
>  LIC_FILES_CHKSUM = "file://README;md5=e7fb9954003d7cd93322ccf282210d1c"
>  
> -PV = "2.2"
> -SRCREV = "02bc76155de5bf4dca243e4d0c019c0ac4c8b3be"
> -PR = "r1"
> +PV = "2.2.1+git${SRCPV}"
> +
> +SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505"
>  SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \
>             file://0001-disable-AI_ADDRCONFIG-flag.patch \
>            "
> -- 
> 1.8.1.4
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]