From 6ed62c6982563442fc9fd27f0f62cc045a6d38eb Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 8 Aug 2018 11:59:15 -0300 Subject: [PATCH] node-arduino-firmata: fix issues with node 8.11.3 Get node version from node executable instead of keeping it hardcoded to the Makefile. Current version of npm install installs a link to the build directory. The workaround is to use npm pack to make a tarball and install from that. npm also adds useless metadata to package.json exposing PKG_BUILD_DIR, so it needs to be stripped. Signed-off-by: Eneas U de Queiroz --- lang/node-arduino-firmata/Makefile | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/lang/node-arduino-firmata/Makefile b/lang/node-arduino-firmata/Makefile index d8ce58861..694183d66 100644 --- a/lang/node-arduino-firmata/Makefile +++ b/lang/node-arduino-firmata/Makefile @@ -10,17 +10,17 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=arduino-firmata PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=0.3.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/shokai/node-arduino-firmata.git +PKG_MIRROR_HASH:=1aef93dc704ea771b9eab51cb64103533f829aee5b2886ad55d173adf3f11ede PKG_SOURCE_VERSION:=v0.3.4 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -#PKG_MIRROR_HASH:=b7a498ccf70e466503e72d38ae5b474e91416b6c9842fd167dff249357b0dc37 PKG_BUILD_DEPENDS:=node/host -PKG_NODE_VERSION:=8.10.0 +PKG_NODE_VERSION:=`$(STAGING_DIR_HOSTPKG)/bin/node --version` PKG_MAINTAINER:=John Crispin PKG_LICENSE:=MIT @@ -51,16 +51,25 @@ EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \ define Build/Compile $(MAKE_FLAGS) \ npm_config_arch=$(CONFIG_ARCH) \ - npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ - npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \ + npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ + npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install -g $(PKG_BUILD_DIR) endef 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) $(PKG_INSTALL_DIR)/usr/lib/node_modules/. $(1)/usr/lib/node + rm -rf $(1)/usr/lib/node/arduino-firmata/node_modules/serialport/ \ + $(1)/usr/lib/node/arduino-firmata/patches \ + $(1)/usr/lib/node/arduino-firmata/.p* \ + $(1)/usr/lib/node/arduino-firmata/.quilt* \ + $(1)/usr/lib/node/arduino-firmata/.built* \ + $(1)/usr/lib/node/arduino-firmata/.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 + find $(1)/usr/lib/node -name package.json -exec sed -i -e 's,$(PKG_BUILD_DIR),,g' {} + $(CP) ./files/* $(1)/ endef