From 4dac8c9cbeb56ac1a3bed6507979cac5e52f0262 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 19 Jul 2017 11:47:21 -0500 Subject: Use a patched node serialport with errno corrected --- recipes-devtools/node-red/node-red_0.11.1.bb | 40 ---------------------------- recipes-devtools/node-red/node-red_0.15.3.bb | 9 ++++++- 2 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 recipes-devtools/node-red/node-red_0.11.1.bb diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb deleted file mode 100644 index 9e441c6..0000000 --- a/recipes-devtools/node-red/node-red_0.11.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Node-RED" -HOMEPAGE = "http://nodered.org" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -DEPENDS = "nodejs nodejs-native" -PR = "r0" - -inherit npm - -S = "${WORKDIR}" - -do_install() { - - # npm install locally - oe_runnpm install --prefix ./ node-red@0.11.1 - - # npm install more stuff - oe_runnpm install --prefix ./node_modules/node-red serialport nodemailer - - # modules needed for loragw - oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants - - # install m2x node - oe_runnpm install --prefix ./node_modules/node-red node-red-m2x - - # remove dupe deps - oe_runnpm dedupe - - # remove Raspberry PI node - rm ./node_modules/node-red/nodes/core/hardware/36-rpi-gpio.html - rm ./node_modules/node-red/nodes/core/hardware/36-rpi-gpio.js - rm ./node_modules/node-red/nodes/core/hardware/nrgpio - rm ./node_modules/node-red/nodes/core/hardware/nrgpio.py - - # install node-red - install -d ${D}/opt/node-red - cp -r ./node_modules/node-red/* ${D}/opt/node-red/ -} - -FILES_${PN} += "/opt/node-red" diff --git a/recipes-devtools/node-red/node-red_0.15.3.bb b/recipes-devtools/node-red/node-red_0.15.3.bb index ae3d6e7..d9e9672 100644 --- a/recipes-devtools/node-red/node-red_0.15.3.bb +++ b/recipes-devtools/node-red/node-red_0.15.3.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://nodered.org" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS = "nodejs nodejs-native" +RDEPENDS_${PN} += "bash" PR = "r0" inherit npm @@ -15,7 +16,10 @@ do_install() { oe_runnpm install --prefix ./ node-red@0.15.3 # npm install more stuff - oe_runnpm install --prefix ./node_modules/node-red serialport nodemailer + oe_runnpm install --prefix./node_modules/node-red nodemailer + # Build patched serialport. + # Original is https://registry.npmjs.org/serialport/-/serialport-1.7.4.tgz + oe_runnpm install --prefix ./node_modules/node-red http://multitech.net/mlinux/sources/node-red-serialport-1.7.4-mt1.tgz # modules needed for loragw oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants @@ -32,6 +36,9 @@ do_install() { rm ./node_modules/node-red/nodes/core/hardware/nrgpio rm ./node_modules/node-red/nodes/core/hardware/nrgpio.py + # remove x86_64 serialport 0.0.5 + rm -rf ./node_modules/node-red/node_modules/node-red-node-serialport + # install node-red install -d ${D}/opt/node-red cp -r ./node_modules/node-red/* ${D}/opt/node-red/ -- cgit v1.2.3