[PATCH] nodejs: replaced v0.2.0 with v0.2.1

[PATCH] nodejs: replaced v0.2.0 with v0.2.1

[AJ ONeal]

From: AJ ONeal <coolaj86+fastr@gmail.com>

* now includes node-waf and node-repl
* updated pathname in libev-cross-cc and libev-cross-cc
* removed patch which is no longer necessary (applied upstream)

Signed-off-by: AJ ONeal <coolaj86@gmail.com>
---
 recipes/nodejs/files/libev-cross-cc.patch          |    6 ++--
 recipes/nodejs/files/node-cross-cc.patch           |    8 ++--
 .../node-dont-include-hosts-usr-include.patch      |   22 -------------
 recipes/nodejs/nodejs_0.2.0.bb                     |   32 --------------------
 recipes/nodejs/nodejs_0.2.1.bb                     |   28 +++++++++++++++++
 5 files changed, 35 insertions(+), 61 deletions(-)
 delete mode 100644 recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
 delete mode 100644 recipes/nodejs/nodejs_0.2.0.bb
 create mode 100644 recipes/nodejs/nodejs_0.2.1.bb

diff --git a/recipes/nodejs/files/libev-cross-cc.patch b/recipes/nodejs/files/libev-cross-cc.patch
index 446015b..4dd34f4 100644
--- a/recipes/nodejs/files/libev-cross-cc.patch
+++ b/recipes/nodejs/files/libev-cross-cc.patch
@@ -1,7 +1,7 @@
-diff --git node-v0.2.0/deps/libev/wscript.orig node-v0.2.0/deps/libev/wscript
+diff --git node-v0.2.1/deps/libev/wscript.orig node-v0.2.1/deps/libev/wscript
 index 19e7bb2..f0a3d3b 100644
---- node-v0.2.0/deps/libev/wscript.orig
-+++ node-v0.2.0/deps/libev/wscript
+--- node-v0.2.1/deps/libev/wscript.orig
++++ node-v0.2.1/deps/libev/wscript
 @@ -52,7 +52,12 @@ def configure(conf):
            return 0;
        }
diff --git a/recipes/nodejs/files/node-cross-cc.patch b/recipes/nodejs/files/node-cross-cc.patch
index 48a6226..0d15afc 100644
--- a/recipes/nodejs/files/node-cross-cc.patch
+++ b/recipes/nodejs/files/node-cross-cc.patch
@@ -1,7 +1,7 @@
-diff --git node-v0.2.0/wscript.orig node-v0.2.0/wscript
-index df9ef53..a55d464 100644
---- node-v0.2.0/wscript.orig
-+++ node-v0.2.0/wscript
+diff --git node-v0.2.1/wscript.orig node-v0.2.1/wscript
+index 9c4243c..3cf6689 100644
+--- node-v0.2.1/wscript.orig
++++ node-v0.2.1/wscript
 @@ -326,6 +326,9 @@ def v8_cmd(bld, variant):
    arch = ""
    if bld.env['DEST_CPU'] == 'x86_64':
diff --git a/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch b/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
deleted file mode 100644
index edbf7c4..0000000
--- a/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git node-v0.2.0/wscript.orig node-v0.2.0/wscript
-index 3c5ebc5..905bd58 100644
---- node-v0.2.0/wscript.orig
-+++ node-v0.2.0/wscript
-@@ -162,11 +162,12 @@ def configure(conf):
-   if Options.options.efence:
-     conf.check(lib='efence', libpath=['/usr/lib', '/usr/local/lib'], uselib_store='EFENCE')
- 
--  if not conf.check(lib="execinfo", includes=['/usr/include', '/usr/local/include'], libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
--    # Note on Darwin/OS X: This will fail, but will still be used as the
--    # execinfo stuff are part of the standard library.
--    if sys.platform.startswith("freebsd"):
--      conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
-+  # OpenEmbedded doesn't like us checking here
-+  #if not conf.check(lib="execinfo", includes=['/usr/include', '/usr/local/include'], libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
-+  #  # Note on Darwin/OS X: This will fail, but will still be used as the
-+  #  # execinfo stuff are part of the standard library.
-+  #  if sys.platform.startswith("freebsd"):
-+  #    conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
- 
-   if not Options.options.without_ssl:
-     if conf.check_cfg(package='openssl',
diff --git a/recipes/nodejs/nodejs_0.2.0.bb b/recipes/nodejs/nodejs_0.2.0.bb
deleted file mode 100644
index 7dfa04e..0000000
--- a/recipes/nodejs/nodejs_0.2.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
-HOMEPAGE = "http://nodejs.org"
-LICENSE = "MIT"
-
-DEPENDS = "openssl"
-
-SRC_URI = " \
-  http://nodejs.org/dist/node-v${PV}.tar.gz \
-  file://node-cross-cc.patch \
-  file://libev-cross-cc.patch \
-  file://node-dont-include-hosts-usr-include.patch \
-"
-SRC_URI[md5sum] = "99a6dacc44b3f9c6ec376ccb446dd0b8"
-SRC_URI[sha256sum] = "3d3eff9287c9917af4044f3cef99ae5b17946710a71e83039de4fcb4b0a26631"
-
-S = "${WORKDIR}/node-v${PV}"
-
-# v8 errors out if you have set CCACHE
-CCACHE = ""
-
-do_configure () {
-  ./configure --prefix=${prefix} --without-snapshot
-}
-
-do_compile () {
-  make
-}
-
-do_install () {
-  DESTDIR=${D} oe_runmake install
-}
-
diff --git a/recipes/nodejs/nodejs_0.2.1.bb b/recipes/nodejs/nodejs_0.2.1.bb
new file mode 100644
index 0000000..5479118
--- /dev/null
+++ b/recipes/nodejs/nodejs_0.2.1.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+DEPENDS = "openssl"
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc.patch \
+  file://node-cross-cc.patch \
+"
+SRC_URI[md5sum] = "c6051dd216817bf0f95bea80c42cf262"
+SRC_URI[sha256sum] = "5bb7d084b2138ce43fcb34739ed894379c450a1dd569a1c710405bc39d2861c2"
+S = "${WORKDIR}/node-v${PV}"
+do_configure () {
+  ./configure --without-snapshot
+}
+do_compile () {
+  make
+}
+do_install () {
+  #oe_runmake install # doesn't install to correct location
+
+  # This works
+  install -d ${D}${bindir}/
+  install -m 0755 ${S}/build/default/node ${D}${bindir}/
+  install -m 0755 ${S}/bin/node-waf ${D}${bindir}/
+  install -m 0755 ${S}/bin/node-repl ${D}${bindir}/
+}
+FILES_${PN} = "${bindir}/node ${bindir}/node-repl ${bindir}/node-waf"
-- 
1.6.3.3

Re: [PATCH] nodejs: replaced v0.2.0 with v0.2.1

[Cliff Brake]

On Wed, Sep 15, 2010 at 1:05 PM, AJ ONeal <coolaj86@gmail.com> wrote:
> From: AJ ONeal <coolaj86+fastr@gmail.com>
>
> * now includes node-waf and node-repl
> * updated pathname in libev-cross-cc and libev-cross-cc
> * removed patch which is no longer necessary (applied upstream)

Pushed, thanks!

Cliff

-- 
=================
http://bec-systems.com

Re: [PATCH] nodejs: replaced v0.2.0 with v0.2.1

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 15-09-10 19:05, AJ ONeal wrote:
> From: AJ ONeal <coolaj86+fastr@gmail.com>

> -do_install () {
> -  DESTDIR=${D} oe_runmake install
> -}

> +do_install () {
> +  #oe_runmake install # doesn't install to correct location
> +
> +  # This works
> +  install -d ${D}${bindir}/
> +  install -m 0755 ${S}/build/default/node ${D}${bindir}/
> +  install -m 0755 ${S}/bin/node-waf ${D}${bindir}/
> +  install -m 0755 ${S}/bin/node-repl ${D}${bindir}/


NAK, you replace a working do_install with a broken one
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMkcF3MkyGM64RGpERAgjTAJ9JLIiRPpck9q1q8c1j4isu+6dr1gCcDEYo
n0HcgkrWAzxxsqAQCQ8girw=
=NPbD
-----END PGP SIGNATURE-----

Re: [PATCH] nodejs: replaced v0.2.0 with v0.2.1

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 15-09-10 19:05, AJ ONeal wrote:

> -# v8 errors out if you have set CCACHE
> -CCACHE = ""

And you broke builds were CCACHE is enabled..
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMkcGwMkyGM64RGpERAkfcAKCYFvGE03QwdIwBC1KG2dzcLno+lgCdE5js
utjUXwXbM3yitNsOtfKhuXM=
=a3lE
-----END PGP SIGNATURE-----

Re: [PATCH] nodejs: replaced v0.2.0 with v0.2.1

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 15-09-10 19:55, Cliff Brake wrote:
> On Wed, Sep 15, 2010 at 1:05 PM, AJ ONeal <coolaj86@gmail.com> wrote:
>> From: AJ ONeal <coolaj86+fastr@gmail.com>
>>
>> * now includes node-waf and node-repl
>> * updated pathname in libev-cross-cc and libev-cross-cc
>> * removed patch which is no longer necessary (applied upstream)
> 
> Pushed, thanks!

Could please pay more attention next time? This introduces 2 big
regressions that were previously fixed by:
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=3967caeb51d7427980e06fd8b6e23c8fdc75e791
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMkcHvMkyGM64RGpERAsElAJ9SOUdmISqP43r50YImwV8z248j1ACfcrha
kRAib6gnBmPQ5b1NBCPygTs=
=b0Gq
-----END PGP SIGNATURE-----

Re: [PATCH] nodejs: replaced v0.2.0 with v0.2.1

[AJ ONeal]

>
> Could please pay more attention next time? This introduces 2 big
> regressions that were previously fixed by:
>
> http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=3967caeb51d7427980e06fd8b6e23c8fdc75e791
>

I'd like to make note of a few things

   - From the feedback I got - "please correct and submit again" - I was
   unaware that my prior submission been accepted.
   (I created this patch on a different machine with a fresh copy of oe and
   I just copied my old recipe over, not noticing it was in - my mistake)

   - Who is the maintainer of this recipe? I assumed that I was since I
   submitted it.
   I thought the policy was something along the lines of letting the
   maintainer know of changes made.
   Granted, had I noticed earlier that it was in the tree I would have I
   would have modified the files in the tree rather blindly copying my stuff
   in.

   - I posted to the list about the oe_runmake install issue and didn't get
   a response, yet the correction was made and submitted.


That said, thanks for the help; I appreciate it. I'll figure out how OE
policy and such works as time goes on. Forgive me of my ignorance as I
learn.

Re: [PATCH] nodejs: replaced v0.2.0 with v0.2.1

[Frans Meulenbroeks]

2010/9/16 AJ ONeal <coolaj86@gmail.com>:
>>
>> Could please pay more attention next time? This introduces 2 big
>> regressions that were previously fixed by:
>>
>> http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=3967caeb51d7427980e06fd8b6e23c8fdc75e791
>>
>
> I'd like to make note of a few things
>
>   - From the feedback I got - "please correct and submit again" - I was
>   unaware that my prior submission been accepted.
>   (I created this patch on a different machine with a fresh copy of oe and
>   I just copied my old recipe over, not noticing it was in - my mistake)
>
>   - Who is the maintainer of this recipe? I assumed that I was since I
>   submitted it.

I'd say yes.

>   I thought the policy was something along the lines of letting the
>   maintainer know of changes made.

The policy is here: http://wiki.openembedded.net/index.php/Commit_Policy

It says:
 * It's fine to fix a recipe you don't maintain, but its polite to talk to
   any else actively maintaining that recipe. Try to contact the maintainer
   or, if no maintainer is listed, send a note to the OE developer mailing list

but apparently some people feel the rules do not apply to them
(although they bitch others if they do deviate from the rules)

>   Granted, had I noticed earlier that it was in the tree I would have I
>   would have modified the files in the tree rather blindly copying my stuff
>   in.
>
>   - I posted to the list about the oe_runmake install issue and didn't get
>   a response, yet the correction was made and submitted.
>
>
> That said, thanks for the help; I appreciate it. I'll figure out how OE
> policy and such works as time goes on. Forgive me of my ignorance as I
> learn.

Welcome to OE.Your contribution is really appreciated.
And we all make mistakes and we all were in your situation at some
point in time.
You'll learn it (and feel free to ask advice here or on irc)

And most of all: have fun!
Frans.