Re: [oe] [meta-oe][PATCH 5/8] nodejs4: reinstate installing all the files
On Wed, Apr 10, 2013 at 06:14:19PM +0200, Koen Kooi wrote: 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 k...@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 nodejs4-native fails here: | mv: cannot stat `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/nodejs4-native/0.4.12-r0/image/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/node': No such file or directory | ERROR: Function failed: do_install (see /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/nodejs4-native/0.4.12-r0/temp/log.do_install.6513 for further information) -- 1.8.1.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 5/8] nodejs4: reinstate installing all the files
Op 11 apr. 2013, om 11:29 heeft Martin Jansa martin.ja...@gmail.com het volgende geschreven: On Wed, Apr 10, 2013 at 06:14:19PM +0200, Koen Kooi wrote: 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 k...@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 nodejs4-native fails here: | mv: cannot stat `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/nodejs4-native/0.4.12-r0/image/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/node': No such file or directory | ERROR: Function failed: do_install (see /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/nodejs4-native/0.4.12-r0/temp/log.do_install.6513 for further information) I'll have a look at that, thanks! ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/8] nodejs4: reinstate installing all the files
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 k...@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 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel