brought nodejs up to v.10, repairing factory image build

6 files changed, 225 insertions, 2 deletions

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index cb3a812..ec66d1d 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -71,7 +71,7 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
 require java.inc
 
-PREFERRED_VERSION_nodejs ?= "0.10.%"
-PREFERRED_VERSION_nodejs-native ?= "0.10.%"
+PREFERRED_VERSION_nodejs ?= "10.%"
+PREFERRED_VERSION_nodejs-native ?= "10.%"
 
 PREFERRED_VERSION_gpsd ?= "3.16"
diff --git a/recipes-devtools/nodejs/nodejs_10.16.2.bb b/recipes-devtools/nodejs/nodejs_10.16.2.bb
new file mode 100644
index 0000000..40c1bd2
--- /dev/null
+++ b/recipes-devtools/nodejs/nodejs_10.16.2.bb
@@ -0,0 +1,9 @@
+require nodejs_10.inc
+
+INC_PR = "r1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c"
+
+SRC_URI[src.md5sum] = "d3dcf975970fe080b1d00221b8070944"
+SRC_URI[src.sha256sum] = "5936ef12ab3f0ce5fbb6751c1bb41f626b6058f414a297b3d8c5eb418a27e8fe"
+
diff --git a/recipes-devtools/nodejs/nodejs_10.4.0.bb b/recipes-devtools/nodejs/nodejs_10.4.0.bb
new file mode 100644
index 0000000..8a85cc2
--- /dev/null
+++ b/recipes-devtools/nodejs/nodejs_10.4.0.bb
@@ -0,0 +1,9 @@
+require nodejs_10.inc
+
+INC_PR = "r1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b0267987d0755bce12779a100826ef97"
+
+SRC_URI[src.md5sum] = "db2fcfb40c4fe4049ad172cf3f99fd2f"
+SRC_URI[src.sha256sum] = "88d9c8179bde19e057cd1d8b835b50726e4c94f8418c91472001e212da96d290"
+
diff --git a/recipes-devtools/nodejs/nodejs_10.inc b/recipes-devtools/nodejs/nodejs_10.inc
new file mode 100644
index 0000000..f8e36e9
--- /dev/null
+++ b/recipes-devtools/nodejs/nodejs_10.inc
@@ -0,0 +1,98 @@
+DESCRIPTION = "Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE = "http://nodejs.org"
+
+LICENSE = "MIT"
+
+COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
+# COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
+COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
+
+INC_PR = "r1"
+PR = "${INC_PR}.4"
+
+PROVIDES = "node"
+RPROVIDES_${PN} = "node"
+
+SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz;name=src \
+           "
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+inherit nodejs-arch
+
+ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \
+                 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \
+                    bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \
+                    bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \
+                    '--with-arm-fpu=vfp', d), d), d)}"
+ARCHFLAGS ?= ""
+
+CROSSCONF = "--cross-compiling"
+CROSSCONF_virtclass-native ="--no-cross-compiling"
+
+GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
+
+PACKAGECONFIG ??= "zlib openssl"
+
+PACKAGECONFIG[zlib] = "--shared-zlib,,zlib,"
+PACKAGECONFIG[openssl] = "--shared-openssl,,openssl,"
+PACKAGECONFIG[v8-inspector] = ",--without-inspector,,"
+
+DISABLE_STATIC = ""
+
+export CXX_host = "${BUILD_CXX}"
+export CC_host = "${BUILD_CC}"
+export CXXFLAGS_host = "${BUILD_CXXFLAGS}"
+export CFLAGS_host = "${BUILD_CFLAGS}"
+
+do_configure () {
+  GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
+  ./configure	--prefix="${prefix}" \
+		--dest-cpu="${@nodejs_map_dest_cpu(d.getVar('TARGET_ARCH', True), d)}" \
+		--dest-os=linux ${ARCHFLAGS} \
+		--with-intl=none \
+		${CROSSCONF} \
+		${PACKAGECONFIG_CONFARGS}
+}
+
+do_compile () {
+  oe_runmake BUILDTYPE=Release
+}
+
+do_install () {
+  oe_runmake install DESTDIR="${D}"
+}
+
+do_install_append_class-native() {
+  # make sure we use node from PATH instead of absolute path to sysroot
+  sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+}
+
+do_install_append_class-nativesdk() {
+  # make sure we use node from PATH instead of absolute path to sysroot
+  sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+  sed "1s^.*^#\!/usr/bin/env python^g" -i ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples
+}
+
+do_install_append_class-target() {
+  # make sure we use node from PATH instead of absolute path to sysroot
+  sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+}
+
+PACKAGES =+ "${PN}-npm"
+FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm"
+RDEPENDS_${PN}-npm = "bash python-compiler python-shell python-datetime python-subprocess python-multiprocessing python-crypt python-textutils python-netclient python-misc"
+
+PACKAGES =+ "${PN}-dtrace"
+FILES_${PN}-dtrace = "${exec_prefix}/lib/dtrace"
+
+PACKAGES =+ "${PN}-systemtap"
+FILES_${PN}-systemtap = "${datadir}/systemtap"
+
+INSANE_SKIP_${PN} += "file-rdeps"
+INSANE_SKIP_${PN}-dbg += "host-user-contaminated"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/nodejs/nodejs_12.8.0.bb b/recipes-devtools/nodejs/nodejs_12.8.0.bb
new file mode 100644
index 0000000..422f88f
--- /dev/null
+++ b/recipes-devtools/nodejs/nodejs_12.8.0.bb
@@ -0,0 +1,9 @@
+require nodejs_12.inc
+
+INC_PR = "r2"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f8efc912ac094c0792011f180755f415"
+
+SRC_URI[src.md5sum] = "f0ddf2d0b6ed3de579a111b39ca08f01"
+SRC_URI[src.sha256sum] = "6f4e4ee7bcb52f782dce5a51d6951ff87151d9504be129d68d7aff469c0f7f36"
+
diff --git a/recipes-devtools/nodejs/nodejs_12.inc b/recipes-devtools/nodejs/nodejs_12.inc
new file mode 100644
index 0000000..f8e36e9
--- /dev/null
+++ b/recipes-devtools/nodejs/nodejs_12.inc
@@ -0,0 +1,98 @@
+DESCRIPTION = "Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE = "http://nodejs.org"
+
+LICENSE = "MIT"
+
+COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
+# COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
+COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
+
+INC_PR = "r1"
+PR = "${INC_PR}.4"
+
+PROVIDES = "node"
+RPROVIDES_${PN} = "node"
+
+SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz;name=src \
+           "
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+inherit nodejs-arch
+
+ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \
+                 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \
+                    bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \
+                    bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \
+                    '--with-arm-fpu=vfp', d), d), d)}"
+ARCHFLAGS ?= ""
+
+CROSSCONF = "--cross-compiling"
+CROSSCONF_virtclass-native ="--no-cross-compiling"
+
+GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
+
+PACKAGECONFIG ??= "zlib openssl"
+
+PACKAGECONFIG[zlib] = "--shared-zlib,,zlib,"
+PACKAGECONFIG[openssl] = "--shared-openssl,,openssl,"
+PACKAGECONFIG[v8-inspector] = ",--without-inspector,,"
+
+DISABLE_STATIC = ""
+
+export CXX_host = "${BUILD_CXX}"
+export CC_host = "${BUILD_CC}"
+export CXXFLAGS_host = "${BUILD_CXXFLAGS}"
+export CFLAGS_host = "${BUILD_CFLAGS}"
+
+do_configure () {
+  GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
+  ./configure	--prefix="${prefix}" \
+		--dest-cpu="${@nodejs_map_dest_cpu(d.getVar('TARGET_ARCH', True), d)}" \
+		--dest-os=linux ${ARCHFLAGS} \
+		--with-intl=none \
+		${CROSSCONF} \
+		${PACKAGECONFIG_CONFARGS}
+}
+
+do_compile () {
+  oe_runmake BUILDTYPE=Release
+}
+
+do_install () {
+  oe_runmake install DESTDIR="${D}"
+}
+
+do_install_append_class-native() {
+  # make sure we use node from PATH instead of absolute path to sysroot
+  sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+}
+
+do_install_append_class-nativesdk() {
+  # make sure we use node from PATH instead of absolute path to sysroot
+  sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+  sed "1s^.*^#\!/usr/bin/env python^g" -i ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples
+}
+
+do_install_append_class-target() {
+  # make sure we use node from PATH instead of absolute path to sysroot
+  sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+}
+
+PACKAGES =+ "${PN}-npm"
+FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm"
+RDEPENDS_${PN}-npm = "bash python-compiler python-shell python-datetime python-subprocess python-multiprocessing python-crypt python-textutils python-netclient python-misc"
+
+PACKAGES =+ "${PN}-dtrace"
+FILES_${PN}-dtrace = "${exec_prefix}/lib/dtrace"
+
+PACKAGES =+ "${PN}-systemtap"
+FILES_${PN}-systemtap = "${datadir}/systemtap"
+
+INSANE_SKIP_${PN} += "file-rdeps"
+INSANE_SKIP_${PN}-dbg += "host-user-contaminated"
+
+BBCLASSEXTEND = "native nativesdk"