From 83c56abf0731d39f8943a3373b88147cbd6aafc5 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 13 Dec 2018 08:07:03 -0200 Subject: [PATCH 1/9] node-cylon: don't use node PKG_BUILD_DIR It breaks buildbot compilation, as the node build dir is cleared before node-cylon gets built. Use files installed in staging_dir instead. Signed-off-by: Eneas U de Queiroz --- lang/node-cylon/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile index 6e2fa3c58554b..6a35fc7221605 100644 --- a/lang/node-cylon/Makefile +++ b/lang/node-cylon/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=cylon PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=0.24.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/hybridgroup/cylon-firmata.git @@ -68,8 +68,8 @@ define Build/Compile cd $(PKG_BUILD_DIR) ; \ $(MAKE_FLAGS) \ npm_config_arch=$(CONFIG_ARCH) \ - npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ - npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ + npm_config_nodedir=$(STAGING_DIR)/usr \ + npm_config_cache=$(TMP_DIR)/npm-cache \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install -g `npm pack $(PKG_BUILD_DIR) | tail -n 1` endef From 92968fbfa5673273705e4ea32bc84f93fb721a5d Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 13 Dec 2018 08:08:21 -0200 Subject: [PATCH 2/9] node-hid: don't use node PKG_BUILD_DIR It breaks buildbot compilation, as the node build dir is cleared before node-hid gets built. Use files installed in staging_dir instead. Signed-off-by: Eneas U de Queiroz --- lang/node-hid/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile index ec5b19fe703ac..ce22ad6969722 100644 --- a/lang/node-hid/Makefile +++ b/lang/node-hid/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=hid PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=0.7.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git @@ -51,8 +51,8 @@ define Build/Compile $(MAKE_VARS) \ $(MAKE_FLAGS) \ npm_config_arch=$(CONFIG_ARCH) \ - npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ - npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ + npm_config_nodedir=$(STAGING_DIR)/usr \ + npm_config_cache=$(TMP_DIR)/npm-cache \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install --build-from-source --target_arch=$(CPU) -g \ `npm pack $(PKG_BUILD_DIR) | tail -n 1` From 83abec65047a4355b5944f1a5e4aeb4ba067d9a9 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 13 Dec 2018 08:09:41 -0200 Subject: [PATCH 3/9] node-serialport: don't use node PKG_BUILD_DIR It breaks buildbot compilation, as the node build dir is cleared before node-serialport gets built. Use files installed in staging_dir instead. Signed-off-by: Eneas U de Queiroz --- lang/node-serialport/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile index 2c75acf0679e6..c632d34b1e525 100644 --- a/lang/node-serialport/Makefile +++ b/lang/node-serialport/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=serialport PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=6.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/ @@ -51,8 +51,8 @@ define Build/Compile cd $(PKG_BUILD_DIR) ; \ $(MAKE_FLAGS) \ npm_config_arch=$(CONFIG_ARCH) \ - npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ - npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ + npm_config_nodedir=$(STAGING_DIR)/usr \ + npm_config_cache=$(TMP_DIR)/npm-cache \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install --build-from-source --target_arch=$(CPU) -g \ `npm pack $(PKG_BUILD_DIR) | tail -n 1` From 1978f84c8064cca3223f27bc2d1e92a4da5341fe Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 13 Dec 2018 08:04:13 -0200 Subject: [PATCH 4/9] node-arduino-firmata: don't use node PKG_BUILD_DIR It breaks buildbot compilation, as the node build dir is cleared before node-arduino-firmata gets built. Use files installed in staging_dir instead. Signed-off-by: Eneas U de Queiroz --- lang/node-arduino-firmata/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile index 84629ac8d41a5..42de99ec234ba 100644 --- a/lang/node-arduino-firmata/Makefile +++ b/lang/node-arduino-firmata/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=arduino-firmata PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=0.3.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/shokai/node-arduino-firmata.git @@ -52,8 +52,8 @@ define Build/Compile cd $(PKG_BUILD_DIR) ; \ $(MAKE_FLAGS) \ npm_config_arch=$(CONFIG_ARCH) \ - npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ - npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ + npm_config_nodedir=$(STAGING_DIR)/usr \ + npm_config_cache=$(TMP_DIR)/npm-cache \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install -g `npm pack $(PKG_BUILD_DIR) | tail -n 1` endef From aa20555f5cb2e2bb110e6e780c31303ced70f953 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Fri, 14 Dec 2018 10:23:40 -0200 Subject: [PATCH 5/9] node-serialport: fix package name in post-install This is a fixup for a copy & paste done in 93d6d1b. Signed-off-by: Eneas U de Queiroz --- lang/node-serialport/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile index c632d34b1e525..717298652a1d9 100644 --- a/lang/node-serialport/Makefile +++ b/lang/node-serialport/Makefile @@ -61,11 +61,11 @@ endef define Package/node-serialport/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/node-hid/patches \ - $(1)/usr/lib/node/node-hid/.p* \ - $(1)/usr/lib/node/node-hid/.quilt* \ - $(1)/usr/lib/node/node-hid/.built* \ - $(1)/usr/lib/node/node-hid/.config* + $(RM) -rf $(1)/usr/lib/node/node-serialport/patches \ + $(1)/usr/lib/node/node-serialport/.p* \ + $(1)/usr/lib/node/node-serialport/.quilt* \ + $(1)/usr/lib/node/node-serialport/.built* \ + $(1)/usr/lib/node/node-serialport/.config* # Strip PKG_BUILD_DIR from useless metadata inserted by npm install # https://github.com/npm/npm/issues/10393 # https://github.com/npm/npm/issues/12110 From cbce6e01285d9d0d37a12272fa7b793e4293b7b1 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 18 Dec 2018 15:16:56 -0200 Subject: [PATCH 6/9] node-arduino-firmata: use --prefix, instead of PREFIX Signed-off-by: Eneas U de Queiroz --- lang/node-arduino-firmata/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile index 42de99ec234ba..11d9b8b88147a 100644 --- a/lang/node-arduino-firmata/Makefile +++ b/lang/node-arduino-firmata/Makefile @@ -54,8 +54,9 @@ define Build/Compile npm_config_arch=$(CONFIG_ARCH) \ npm_config_nodedir=$(STAGING_DIR)/usr \ npm_config_cache=$(TMP_DIR)/npm-cache \ - PREFIX="$(PKG_INSTALL_DIR)/usr/" \ - npm install -g `npm pack $(PKG_BUILD_DIR) | tail -n 1` + npm install -g \ + --prefix="$(PKG_INSTALL_DIR)/usr/" \ + `npm pack $(PKG_BUILD_DIR) | tail -n 1` endef define Package/node-arduino-firmata/install From 2e6e8048ffadbb6804bddeec8391cebfd2312b42 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 18 Dec 2018 15:17:49 -0200 Subject: [PATCH 7/9] node-cylon: use --prefix, instead of PREFIX Signed-off-by: Eneas U de Queiroz --- lang/node-cylon/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/node-cylon/Makefile b/lang/node-cylon/Makefile index 6a35fc7221605..23cb1d59f7c8b 100644 --- a/lang/node-cylon/Makefile +++ b/lang/node-cylon/Makefile @@ -70,8 +70,9 @@ define Build/Compile npm_config_arch=$(CONFIG_ARCH) \ npm_config_nodedir=$(STAGING_DIR)/usr \ npm_config_cache=$(TMP_DIR)/npm-cache \ - PREFIX="$(PKG_INSTALL_DIR)/usr/" \ - npm install -g `npm pack $(PKG_BUILD_DIR) | tail -n 1` + npm install -g \ + --prefix="$(PKG_INSTALL_DIR)/usr/" \ + `npm pack $(PKG_BUILD_DIR) | tail -n 1` endef define Package/node-cylon/install From 82d9537859e5ec8ba080030f62c2663663457424 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 18 Dec 2018 15:17:49 -0200 Subject: [PATCH 8/9] node-hid: use --prefix, instead of PREFIX Signed-off-by: Eneas U de Queiroz --- lang/node-hid/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile index ce22ad6969722..901ee65dc17dc 100644 --- a/lang/node-hid/Makefile +++ b/lang/node-hid/Makefile @@ -53,8 +53,8 @@ define Build/Compile npm_config_arch=$(CONFIG_ARCH) \ npm_config_nodedir=$(STAGING_DIR)/usr \ npm_config_cache=$(TMP_DIR)/npm-cache \ - PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install --build-from-source --target_arch=$(CPU) -g \ + --prefix="$(PKG_INSTALL_DIR)/usr/" \ `npm pack $(PKG_BUILD_DIR) | tail -n 1` endef From c6b49af45fd6bd668ee2edf65b3fe2abb29a7b0b Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 18 Dec 2018 15:17:49 -0200 Subject: [PATCH 9/9] node-serialport: use --prefix, instead of PREFIX Signed-off-by: Eneas U de Queiroz --- lang/node-serialport/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile index 717298652a1d9..928cb398cb279 100644 --- a/lang/node-serialport/Makefile +++ b/lang/node-serialport/Makefile @@ -53,8 +53,8 @@ define Build/Compile npm_config_arch=$(CONFIG_ARCH) \ npm_config_nodedir=$(STAGING_DIR)/usr \ npm_config_cache=$(TMP_DIR)/npm-cache \ - PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install --build-from-source --target_arch=$(CPU) -g \ + --prefix="$(PKG_INSTALL_DIR)/usr/" \ `npm pack $(PKG_BUILD_DIR) | tail -n 1` endef