* [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14
@ 2012-04-09 15:16 Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 02/10] nodejs 0.4.12: rename to node4 to make it parallel installable with 0.6.x Koen Kooi
` (8 more replies)
0 siblings, 9 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
The LICENSE checksum changed due to date changes and clarification on licenses of included "libraries" like the markdown parser
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../nodejs/{nodejs_0.6.8.bb => nodejs_0.6.14.bb} | 22 ++++++++++++++-----
1 files changed, 16 insertions(+), 6 deletions(-)
rename meta-oe/recipes-devtools/nodejs/{nodejs_0.6.8.bb => nodejs_0.6.14.bb} (66%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.8.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.14.bb
similarity index 66%
rename from meta-oe/recipes-devtools/nodejs/nodejs_0.6.8.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_0.6.14.bb
index bd404ae..4f85bf3 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.8.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.14.bb
@@ -1,21 +1,26 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=672cc6c8dbb3e918277a61ea98f088f6"
-
-DEFAULT_PREFERENCE = "-1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d66c1f33ba9b89616e45f588e7606ee6"
DEPENDS = "openssl"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-SRC_URI[md5sum] = "9fd7baa2d27b848c3134e6ae35bb87b2"
-SRC_URI[sha256sum] = "e6cbfc5ccdbe10128dbbd4dc7a88c154d80f8a39c3a8477092cf7d25eef78c9c"
+SRC_URI[md5sum] = "3033a866e230cca64e212ee8f2af27dd"
+SRC_URI[sha256sum] = "e41922308155c5197c2d048948ca9cd76ea5f9a51f977e1591bd93fe17d4cf1f"
S = "${WORKDIR}/node-v${PV}"
# v8 errors out if you have set CCACHE
CCACHE = ""
+do_configure_virtclass-native () {
+ sed -i -e s:\'/usr/lib:\'${STAGING_LIBDIR}:g wscript
+ sed -i -e s:\'/usr/local/lib:\'${STAGING_LIBDIR}:g wscript
+
+ ./configure --prefix=${prefix} --without-snapshot
+}
+
# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround waf+scons
do_configure () {
echo '#!/bin/sh' > ${WORKDIR}/gcc
@@ -36,6 +41,10 @@ do_configure () {
./configure --prefix=${prefix} --without-snapshot
}
+do_compile_virtclass-native () {
+ make
+}
+
do_compile () {
export PATH=${WORKDIR}:${PATH}
export CC=gcc
@@ -48,6 +57,7 @@ do_install () {
}
RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
+RDEPENDS_${PN}_virtclass-native = "curl-native python-native"
-FILES_${PN} += "${libdir}/node/wafadmin"
+FILES_${PN} += "${libdir}/node/wafadmin ${libdir}/node_modules"
BBCLASSEXTEND = "native"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 02/10] nodejs 0.4.12: rename to node4 to make it parallel installable with 0.6.x
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 03/10] cloud9 0.5.1: use nodejs4 instead of nodejs Koen Kooi
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
This is done to support running cloud9 using node 0.4.x but all other node apps with 0.6.x
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../libev-cross-cc_0.4.12.patch | 0
.../nodejs/{nodejs_0.4.12.bb => nodejs4_0.4.12.bb} | 7 ++-----
2 files changed, 2 insertions(+), 5 deletions(-)
rename meta-oe/recipes-devtools/nodejs/{nodejs => nodejs4}/libev-cross-cc_0.4.12.patch (100%)
rename meta-oe/recipes-devtools/nodejs/{nodejs_0.4.12.bb => nodejs4_0.4.12.bb} (72%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs4/libev-cross-cc_0.4.12.patch
similarity index 100%
rename from meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.12.patch
rename to meta-oe/recipes-devtools/nodejs/nodejs4/libev-cross-cc_0.4.12.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.4.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
similarity index 72%
rename from meta-oe/recipes-devtools/nodejs/nodejs_0.4.12.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
index b87b969..522b539 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.4.12.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
@@ -28,11 +28,8 @@ do_compile () {
}
do_install () {
- DESTDIR=${D} oe_runmake install
+ install -d ${D}${bindir}
+ install -m 0755 build/default/node ${D}${bindir}/node4
}
-RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
-RDEPENDS_${PN}_virtclass-native = "curl-native python-native"
-FILES_${PN} += "${libdir}/node/wafadmin"
-BBCLASSEXTEND = "native"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 03/10] cloud9 0.5.1: use nodejs4 instead of nodejs
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 02/10] nodejs 0.4.12: rename to node4 to make it parallel installable with 0.6.x Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 04/10] cloud9: add 0.6 Koen Kooi
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
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(-)
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
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 04/10] cloud9: add 0.6
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 02/10] nodejs 0.4.12: rename to node4 to make it parallel installable with 0.6.x Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 03/10] cloud9 0.5.1: use nodejs4 instead of nodejs Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 05/10] cloud9: remove 0.5.1 Koen Kooi
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../cloud9/{cloud9_0.5.1.bb => cloud9_0.6.bb} | 32 ++++++++-----------
1 files changed, 14 insertions(+), 18 deletions(-)
copy meta-oe/recipes-devtools/cloud9/{cloud9_0.5.1.bb => cloud9_0.6.bb} (82%)
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
similarity index 82%
copy from meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
copy to meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index 4f74edb..96b1583 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -3,17 +3,14 @@ HOMEPAGE = "http://c9.io"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
+DEFAULT_PREFERENCE = "-1"
+
DEPENDS = "libxml2 nodejs-native"
-PR = "r16"
-
SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \
git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
- git://github.com/ajaxorg/cockpit.git;destsuffix=git/support/ace/support/cockpit;name=cockpit \
- git://github.com/ajaxorg/dryice.git;destsuffix=git/support/ace/support/dryice;name=dryice \
- git://github.com/ajaxorg/pilot.git;destsuffix=git/support/ace/support/pilot;name=pilot \
git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect \
@@ -31,20 +28,18 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio \
git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
+ git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
file://index.js \
file://cloud9.service \
file://cloud9-avahi.service \
"
-SRCREV_cloud9ide = "e61d37c19b981e8750084a1c3df60365f3436c19"
-SRCREV_o3 = "49ccc189a12728475875e9e7a9040553ab0b2316"
-SRCREV_ace = "9ec72ff319c06c4a1f93dae3157021eefbac338d"
-SRCREV_acewiki = "cc5ccde4565f7b21c81345f47e941e011e94b810"
-SRCREV_cockpit = "33f02ab3af5d755c98b3c58309ac2c62fc6de736"
-SRCREV_dryice = "375d9a339646d70846ad40eddaad406198dd9d40"
-SRCREV_pilot = "48ddaa841476ddf9210ccbb2b310952db8212084"
-SRCREV_apf = "d8d24b52829803d7e55fec90607a2595975402b8"
+SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed"
+SRCREV_o3 = "302cd3a6d5039f53a9fa3932bed88b53281c1e1e"
+SRCREV_ace = "0fc5392cbe46fb134052c3065a238ad8e3b31cfd"
+SRCREV_acewiki = "d2a65d0addc2e5ab922bbff9cb6022a4652b4f13"
+SRCREV_apf = "2560b762b2b0e5a8b46f8a4062f927a9a9d239f4"
SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072"
SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4"
SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749"
@@ -52,15 +47,16 @@ SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2"
SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584"
SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f"
SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420"
-SRCREV_jsdav = "b06a73920ebdb1a671e86e2e47ee67400ba14785"
+SRCREV_jsdav = "f04ebf3d012cc8aeabfcfb2b8fab8966d52929e9"
SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651"
-SRCREV_formidable = "0cba820cabc23250d47754e57d9f61cc73d12f2a"
-SRCREV_jsftp = "f93b4eeb6d96ffebbc378c8c040684cf82a63885"
+SRCREV_formidable = "a37292d4b7d6d76a38909ed670334c9068d40871"
+SRCREV_jsftp = "e3f10c8927347c170cdd0150ef38e18272acf942"
SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d"
SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71"
-SRCREV_lib-v8debug = "29b20d01e6854da2173e1665ea141dab6b5a8104"
+SRCREV_lib-v8debug = "7c11897f4bc77c7275c2b6dff5becc72ac018662"
SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06"
-SRCREV_socketio-client = "d12e0714e96490dfff770dc1d184e672549c6477"
+SRCREV_socketio-client = "4375ef1344ecb8ad75a3848a00af6b391822f86b"
+SRCREV_treehugger = "436d0d6dd0ce43782e6be08ad12c356730626996"
SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad"
SRCREV_FORMAT = "cloud9ide"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 05/10] cloud9: remove 0.5.1
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
` (2 preceding siblings ...)
2012-04-09 15:16 ` [meta-oe][PATCH 04/10] cloud9: add 0.6 Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 17:32 ` Denys Dmytriyenko
2012-04-09 15:16 ` [meta-oe][PATCH 06/10] systemd: bump SRCREV Koen Kooi
` (4 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb | 114 -----------------------
1 files changed, 0 insertions(+), 114 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
deleted file mode 100644
index 4f74edb..0000000
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
+++ /dev/null
@@ -1,114 +0,0 @@
-DESCRIPTION = "Meet Cloud9, development-as-a-service for Javascripters and other developers"
-HOMEPAGE = "http://c9.io"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
-
-DEPENDS = "libxml2 nodejs-native"
-
-PR = "r16"
-
-SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
- git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
- git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \
- git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
- git://github.com/ajaxorg/cockpit.git;destsuffix=git/support/ace/support/cockpit;name=cockpit \
- git://github.com/ajaxorg/dryice.git;destsuffix=git/support/ace/support/dryice;name=dryice \
- git://github.com/ajaxorg/pilot.git;destsuffix=git/support/ace/support/pilot;name=pilot \
- git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
- git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
- git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect \
- git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \
- git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \
- git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \
- git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \
- git://github.com/visionmedia/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \
- git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \
- git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \
- git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \
- git://github.com/ajaxorg/jsftp.git;destsuffix=git/support/jsdav/support/jsftp;name=jsftp \
- git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \
- git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \
- git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
- git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio \
- git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
- git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
- file://index.js \
- file://cloud9.service \
- file://cloud9-avahi.service \
- "
-
-SRCREV_cloud9ide = "e61d37c19b981e8750084a1c3df60365f3436c19"
-SRCREV_o3 = "49ccc189a12728475875e9e7a9040553ab0b2316"
-SRCREV_ace = "9ec72ff319c06c4a1f93dae3157021eefbac338d"
-SRCREV_acewiki = "cc5ccde4565f7b21c81345f47e941e011e94b810"
-SRCREV_cockpit = "33f02ab3af5d755c98b3c58309ac2c62fc6de736"
-SRCREV_dryice = "375d9a339646d70846ad40eddaad406198dd9d40"
-SRCREV_pilot = "48ddaa841476ddf9210ccbb2b310952db8212084"
-SRCREV_apf = "d8d24b52829803d7e55fec90607a2595975402b8"
-SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072"
-SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4"
-SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749"
-SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2"
-SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584"
-SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f"
-SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420"
-SRCREV_jsdav = "b06a73920ebdb1a671e86e2e47ee67400ba14785"
-SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651"
-SRCREV_formidable = "0cba820cabc23250d47754e57d9f61cc73d12f2a"
-SRCREV_jsftp = "f93b4eeb6d96ffebbc378c8c040684cf82a63885"
-SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d"
-SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71"
-SRCREV_lib-v8debug = "29b20d01e6854da2173e1665ea141dab6b5a8104"
-SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06"
-SRCREV_socketio-client = "d12e0714e96490dfff770dc1d184e672549c6477"
-SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad"
-
-SRCREV_FORMAT = "cloud9ide"
-
-S = "${WORKDIR}/git"
-
-do_configure () {
- cd ${WORKDIR}/o3
- 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"
-
-do_compile () {
- cd ${WORKDIR}/o3
- node 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
- cd ..
- ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2
-}
-
-do_install () {
- install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9
- rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9
-
- touch ${D}${bindir}/cloud9
- echo "#!/bin/sh" > ${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
- install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js
- install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
- install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
-
- install -m 0755 -d ${D}${sysconfdir}/avahi/services/
- install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/
-}
-
-FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \
- ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
- "
-
-RDEPENDS_${PN} = "nodejs4 gzip"
-
-inherit systemd
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "cloud9.service"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 06/10] systemd: bump SRCREV
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
` (3 preceding siblings ...)
2012-04-09 15:16 ` [meta-oe][PATCH 05/10] cloud9: remove 0.5.1 Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 07/10] systemd: fix vconsole-setup dependencies Koen Kooi
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
...nald-allocate-PAGE_SIZE-bytes-for-selinux.patch | 34 --------------------
...-logind-don-t-kill-user-processes-on-exit.patch | 31 ------------------
meta-oe/recipes-core/systemd/systemd_git.bb | 6 +--
3 files changed, 2 insertions(+), 69 deletions(-)
delete mode 100644 meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
delete mode 100644 meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch b/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
deleted file mode 100644
index 9c74f67..0000000
--- a/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9d3226c3a3dd34e7299aa693544e45b8ebe9410b Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 18 Mar 2012 09:18:39 +0100
-Subject: [PATCH] Revert "journald: allocate PAGE_SIZE bytes for selinux label length"
-
-This reverts commit 2d44fc7ba5aaf700672baa7b0697caefddafdc53.
----
- src/journal/journald.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald.c b/src/journal/journald.c
-index baad3ab..3dde891 100644
---- a/src/journal/journald.c
-+++ b/src/journal/journald.c
-@@ -29,7 +29,6 @@
- #include <sys/ioctl.h>
- #include <linux/sockios.h>
- #include <sys/statvfs.h>
--#include <sys/user.h>
-
- #include <systemd/sd-journal.h>
- #include <systemd/sd-login.h>
-@@ -2144,7 +2143,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
- uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
- CMSG_SPACE(sizeof(struct timeval)) +
- CMSG_SPACE(sizeof(int)) +
-- CMSG_SPACE(PAGE_SIZE)]; /* selinux label */
-+ CMSG_SPACE(LINE_MAX)]; /* selinux label */
- } control;
- ssize_t n;
- int v;
---
-1.7.2.5
-
diff --git a/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch b/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch
deleted file mode 100644
index c28f189..0000000
--- a/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From eccbcfd37d41e1cb66bdf19cded899a36cc3842d Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Tue, 7 Feb 2012 10:12:51 +0100
-Subject: [PATCH 2/2] systemd-logind: don't kill user processes on exit
-
-This fixed screen and tmux
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-Upstream-status: Unknown
-
----
- src/login/systemd-logind.conf | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/login/systemd-logind.conf b/src/login/systemd-logind.conf
-index 9909804..ba69b6c 100644
---- a/src/login/systemd-logind.conf
-+++ b/src/login/systemd-logind.conf
-@@ -9,7 +9,7 @@
-
- [Login]
- #NAutoVTs=6
--#KillUserProcesses=no
-+KillUserProcesses=no
- #KillOnlyUsers=
- #KillExcludeUsers=root
- #Controllers=
---
-1.7.2.5
-
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index e3aec31..d38bbc1 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,15 +14,13 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}"
PV = "git"
-PR = "r23"
+PR = "r24"
inherit useradd pkgconfig autotools vala perlnative
-SRCREV = "5ebff5337594d690b322078c512eb222d34aaa82"
+SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443"
SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
- file://0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch \
- file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \
${UCLIBCPATCHES} \
"
UCLIBCPATCHES = ""
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 07/10] systemd: fix vconsole-setup dependencies
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
` (4 preceding siblings ...)
2012-04-09 15:16 ` [meta-oe][PATCH 06/10] systemd: bump SRCREV Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 08/10] gvfs-gdu-volume-monitor 1.8.2: remove conflicting files Koen Kooi
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-oe/recipes-core/systemd/systemd_git.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index d38bbc1..becbc90 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}"
PV = "git"
-PR = "r24"
+PR = "r25"
inherit useradd pkgconfig autotools vala perlnative
@@ -86,7 +86,7 @@ FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
${systemd_unitdir}/system/systemd-vconsole-setup.service \
${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service"
-RRECOMMENDS_$PN}-vconsole-setup = "kbd kbd-consolefonts"
+RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts"
FILES_${PN} = " ${base_bindir}/* \
${datadir}/dbus-1/services \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 08/10] gvfs-gdu-volume-monitor 1.8.2: remove conflicting files
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
` (5 preceding siblings ...)
2012-04-09 15:16 ` [meta-oe][PATCH 07/10] systemd: fix vconsole-setup dependencies Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 09/10] xbmc: update to head of the Eden release branch Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 10/10] xbmc: fix .desktop for ARM Koen Kooi
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
* check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
But that file is already provided by package * gvfs
* check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
But that file is already provided by package * gvfs
* check_data_file_clashes: Package gvfs-gdu-volume-monitor wants to install file /usr/share/GConf/gsettings/gvfs-dns-sd.convert
But that file is already provided by package * gvfs
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb
index c87b63e..689f455 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb
@@ -4,7 +4,7 @@ BPN = "gvfs"
DEPENDS = "gvfs gnome-disk-utility"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
# we need gdu files only: reduce files to delete in libexecdir
EXTRA_OECONF += "--disable-gphoto2"
@@ -15,6 +15,8 @@ do_install_append() {
rm -rf ${D}${includedir}
rm -rf ${D}${libdir}
rm -rf ${D}${datadir}/gvfs/mounts
+ rm -rf ${D}${datadir}/glib-2.0
+ rm -rf ${D}${datadir}/GConf
rm -f ${D}${datadir}/dbus-1/services/gvfs-*
rm -f ${D}${libexecdir}/gvfsd*
rm -f ${D}${libexecdir}/gvfs-fuse-daemon
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 09/10] xbmc: update to head of the Eden release branch
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
` (6 preceding siblings ...)
2012-04-09 15:16 ` [meta-oe][PATCH 08/10] gvfs-gdu-volume-monitor 1.8.2: remove conflicting files Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 10/10] xbmc: fix .desktop for ARM Koen Kooi
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-oe/recipes-multimedia/xbmc/xbmc_git.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
index 751d9ca..459b571 100644
--- a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
+++ b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib"
#require recipes/egl/egl.inc
-SRCREV = "14feb096bcea1e434b5ab23888d6a4c62240f6e0"
+SRCREV = "1d975a04c6686b9a82f63a4c605a5c5c5f84d0e8"
PV = "11.0"
-PR = "r12"
+PR = "r13"
PR_append = "+gitr${SRCPV}"
SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-oe][PATCH 10/10] xbmc: fix .desktop for ARM
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
` (7 preceding siblings ...)
2012-04-09 15:16 ` [meta-oe][PATCH 09/10] xbmc: update to head of the Eden release branch Koen Kooi
@ 2012-04-09 15:16 ` Koen Kooi
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 15:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-oe/recipes-multimedia/xbmc/xbmc_git.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
index 459b571..0595c9b 100644
--- a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
+++ b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
@@ -58,6 +58,11 @@ do_compile_prepend() {
sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir)::g' ${S}/Makefile
}
+# on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly
+do_install_append_arm() {
+ sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop
+}
+
FILES_${PN} += "${datadir}/xsessions ${datadir}/icons"
FILES_${PN}-dbg += "${libdir}/xbmc/.debug ${libdir}/xbmc/*/.debug ${libdir}/xbmc/*/*/.debug ${libdir}/xbmc/*/*/*/.debug"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [meta-oe][PATCH 05/10] cloud9: remove 0.5.1
2012-04-09 15:16 ` [meta-oe][PATCH 05/10] cloud9: remove 0.5.1 Koen Kooi
@ 2012-04-09 17:32 ` Denys Dmytriyenko
2012-04-09 17:39 ` Koen Kooi
0 siblings, 1 reply; 12+ messages in thread
From: Denys Dmytriyenko @ 2012-04-09 17:32 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
On Mon, Apr 09, 2012 at 05:16:08PM +0200, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb | 114 -----------------------
> 1 files changed, 0 insertions(+), 114 deletions(-)
> delete mode 100644 meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
Patches #3 and #4 make changes to cloud9_0.5.1 and then in #5 you drop it,
which is kind of confusing. I understand that was the development progression
to get to version 6, but I guess they can be squashed here...
--
Denys
> diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
> deleted file mode 100644
> index 4f74edb..0000000
> --- a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
> +++ /dev/null
> @@ -1,114 +0,0 @@
> -DESCRIPTION = "Meet Cloud9, development-as-a-service for Javascripters and other developers"
> -HOMEPAGE = "http://c9.io"
> -LICENSE = "GPLv3"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
> -
> -DEPENDS = "libxml2 nodejs-native"
> -
> -PR = "r16"
> -
> -SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
> - git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
> - git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \
> - git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
> - git://github.com/ajaxorg/cockpit.git;destsuffix=git/support/ace/support/cockpit;name=cockpit \
> - git://github.com/ajaxorg/dryice.git;destsuffix=git/support/ace/support/dryice;name=dryice \
> - git://github.com/ajaxorg/pilot.git;destsuffix=git/support/ace/support/pilot;name=pilot \
> - git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
> - git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
> - git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect \
> - git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \
> - git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \
> - git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \
> - git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \
> - git://github.com/visionmedia/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \
> - git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \
> - git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \
> - git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \
> - git://github.com/ajaxorg/jsftp.git;destsuffix=git/support/jsdav/support/jsftp;name=jsftp \
> - git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \
> - git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \
> - git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
> - git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio \
> - git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
> - git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
> - file://index.js \
> - file://cloud9.service \
> - file://cloud9-avahi.service \
> - "
> -
> -SRCREV_cloud9ide = "e61d37c19b981e8750084a1c3df60365f3436c19"
> -SRCREV_o3 = "49ccc189a12728475875e9e7a9040553ab0b2316"
> -SRCREV_ace = "9ec72ff319c06c4a1f93dae3157021eefbac338d"
> -SRCREV_acewiki = "cc5ccde4565f7b21c81345f47e941e011e94b810"
> -SRCREV_cockpit = "33f02ab3af5d755c98b3c58309ac2c62fc6de736"
> -SRCREV_dryice = "375d9a339646d70846ad40eddaad406198dd9d40"
> -SRCREV_pilot = "48ddaa841476ddf9210ccbb2b310952db8212084"
> -SRCREV_apf = "d8d24b52829803d7e55fec90607a2595975402b8"
> -SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072"
> -SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4"
> -SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749"
> -SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2"
> -SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584"
> -SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f"
> -SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420"
> -SRCREV_jsdav = "b06a73920ebdb1a671e86e2e47ee67400ba14785"
> -SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651"
> -SRCREV_formidable = "0cba820cabc23250d47754e57d9f61cc73d12f2a"
> -SRCREV_jsftp = "f93b4eeb6d96ffebbc378c8c040684cf82a63885"
> -SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d"
> -SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71"
> -SRCREV_lib-v8debug = "29b20d01e6854da2173e1665ea141dab6b5a8104"
> -SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06"
> -SRCREV_socketio-client = "d12e0714e96490dfff770dc1d184e672549c6477"
> -SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad"
> -
> -SRCREV_FORMAT = "cloud9ide"
> -
> -S = "${WORKDIR}/git"
> -
> -do_configure () {
> - cd ${WORKDIR}/o3
> - 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"
> -
> -do_compile () {
> - cd ${WORKDIR}/o3
> - node 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
> - cd ..
> - ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2
> -}
> -
> -do_install () {
> - install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9
> - rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9
> -
> - touch ${D}${bindir}/cloud9
> - echo "#!/bin/sh" > ${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
> - install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js
> - install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
> - install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
> -
> - install -m 0755 -d ${D}${sysconfdir}/avahi/services/
> - install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/
> -}
> -
> -FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \
> - ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
> - "
> -
> -RDEPENDS_${PN} = "nodejs4 gzip"
> -
> -inherit systemd
> -
> -SYSTEMD_PACKAGES = "${PN}"
> -SYSTEMD_SERVICE_${PN} = "cloud9.service"
> --
> 1.7.2.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-oe][PATCH 05/10] cloud9: remove 0.5.1
2012-04-09 17:32 ` Denys Dmytriyenko
@ 2012-04-09 17:39 ` Koen Kooi
0 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2012-04-09 17:39 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: openembedded-devel
Op 9 apr. 2012, om 19:32 heeft Denys Dmytriyenko het volgende geschreven:
> On Mon, Apr 09, 2012 at 05:16:08PM +0200, Koen Kooi wrote:
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb | 114 -----------------------
>> 1 files changed, 0 insertions(+), 114 deletions(-)
>> delete mode 100644 meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
>
> Patches #3 and #4 make changes to cloud9_0.5.1 and then in #5 you drop it,
> which is kind of confusing. I understand that was the development progression
> to get to version 6, but I guess they can be squashed here...
I wasn't sure if someone wants to keep 0.5.1 (or object to the node changes), so I kept the commits seperated. If people think it's better to squash them all into one, that's fine by me.
regards,
Koen
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-04-09 17:48 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-09 15:16 [meta-oe][PATCH 01/10] nodejs 0.6.x: update to 0.6.14 Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 02/10] nodejs 0.4.12: rename to node4 to make it parallel installable with 0.6.x Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 03/10] cloud9 0.5.1: use nodejs4 instead of nodejs Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 04/10] cloud9: add 0.6 Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 05/10] cloud9: remove 0.5.1 Koen Kooi
2012-04-09 17:32 ` Denys Dmytriyenko
2012-04-09 17:39 ` Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 06/10] systemd: bump SRCREV Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 07/10] systemd: fix vconsole-setup dependencies Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 08/10] gvfs-gdu-volume-monitor 1.8.2: remove conflicting files Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 09/10] xbmc: update to head of the Eden release branch Koen Kooi
2012-04-09 15:16 ` [meta-oe][PATCH 10/10] xbmc: fix .desktop for ARM Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox