2483673439
This updates: * node * node-arduino-firmata * node-cylon * node-hid * node-serialport to their version used in LEDE v17.01.6. This fixes compile errors appearing on Debian Sid. A list of the patches picked from upstream (x'd ones excluded): $ git log --oneline 8ca186cd59..HEAD lang/node lang/node-arduino-firmata/ lang/node-cylon/ lang/node-hid/ lang/node-serialport/ x 4a984a8d6 treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) x 844638d51 Merge pull request #3056 from plntyk/fix_node 0da71b8f8 node: use default host install prefix def97187d Treewide fix of typo: PKG_LICENSE_FILE --> PKG_LICENSE_FILES bc86e32d4 node: fix soft/hard float compile on arm/mips 865f44ef7 node,node-*: node update to v4.4.5 and Enhance CPU-arch variant. a3148b64e node-hid: fix git submodule issue aa9202fac node-hid: fix compile error c9115cdf5 node-*: node update to v4.4.4 x bbce5fce7 node: fix undefined behaviour leading to broken code with GCC 6 9125c3615 node: update to v4.4.4 5a118cda9 node update v0.12.13 x fb744a658 Merge pull request #2486 from yousong/cp-fix bca789b6b node-* : specify npm_config_cache directory ac000220c node-* : specify npm_config_cache directory 47f466e88 node-* : specify npm_config_cache directory 10c6b4110 node-* : specify npm_config_cache directory a82363f0a node-serialport: add node host dependency 0498c8ae2 node-hid: add node host dependency a64623683 node-cylon: add node host dependency 2b8a17de0 node-arduino-firmata: add node host dependency 92b0575e2 Drop the redundant -r option to $(CP) x 9f8e5aca3 treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk e5ca27a97 node: fix build on x86 & x86.64 targets x 659719005 node: add python/host to HOST_BUILD_DEPENDS as well Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
57 lines
2.7 KiB
Diff
57 lines
2.7 KiB
Diff
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Date: Sat, 12 Mar 2016 01:10:04 +0800
|
|
Subject: Drop the redundant -r option to $(CP)
|
|
|
|
$(CP) was defined as `cp -fpR' since the very begining of OpenWrt build
|
|
system (2006-06-22). The -R option should be enough and base packages
|
|
use only $(CP) for the same purposes just fine and BSD manual of cp also
|
|
discourages the use of `-r' option. So let's just tidy up the usage now.
|
|
|
|
[linus.luessing@c0d3.blue: backport, node* only]
|
|
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
|
|
|
diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile
|
|
index aced0701287475e245a185f969b71232cf3ee6e0..73e8da126c5fc068f5af332cfde683449d16c849 100644
|
|
--- a/lang/node-arduino-firmata/Makefile
|
|
+++ b/lang/node-arduino-firmata/Makefile
|
|
@@ -60,7 +60,7 @@ define Package/node-arduino-firmata/install
|
|
mkdir -p $(1)/usr/lib/node
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node
|
|
rm -rf $(1)/usr/lib/node/arduino-firmata/node_modules/serialport/
|
|
- $(CP) -r ./files/* $(1)/
|
|
+ $(CP) ./files/* $(1)/
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,node-arduino-firmata))
|
|
diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile
|
|
index 753ae2319b103e392297c8cf63c915cc2fcd3453..c2e3b7265d11316dabd22dbf0f6ea8ee83fdeb5a 100644
|
|
--- a/lang/node-cylon/Makefile
|
|
+++ b/lang/node-cylon/Makefile
|
|
@@ -73,22 +73,22 @@ endef
|
|
|
|
define Package/node-cylon/install
|
|
mkdir -p $(1)/usr/lib/node/cylon
|
|
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon/* $(1)/usr/lib/node/cylon/
|
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon/* $(1)/usr/lib/node/cylon/
|
|
endef
|
|
|
|
define Package/node-cylon-i2c/install
|
|
mkdir -p $(1)/usr/lib/node/cylon-i2c
|
|
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-i2c/* $(1)/usr/lib/node/cylon-i2c/
|
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-i2c/* $(1)/usr/lib/node/cylon-i2c/
|
|
endef
|
|
|
|
define Package/node-cylon-gpio/install
|
|
mkdir -p $(1)/usr/lib/node/cylon-gpio
|
|
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-gpio/* $(1)/usr/lib/node/cylon-gpio/
|
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/node_modules/cylon-gpio/* $(1)/usr/lib/node/cylon-gpio/
|
|
endef
|
|
|
|
define Package/node-cylon-firmata/install
|
|
mkdir -p $(1)/usr/lib/node/cylon-firmata
|
|
- $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/{index.js,lib,LICENSE,package.json,README.md,RELEASES.md,spec} $(1)/usr/lib/node/cylon-firmata/
|
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/cylon-firmata/{index.js,lib,LICENSE,package.json,README.md,RELEASES.md,spec} $(1)/usr/lib/node/cylon-firmata/
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,node-cylon))
|