From ad6f5b23d755cdb4413e5f25ce259d6f523288e4 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Tue, 27 Apr 2021 14:41:37 +0900 Subject: [PATCH] libupm: Disable node.js support Library for node.js will be disabled temporarily due to difficulty in supporting the latest node.js. Signed-off-by: Hirokazu MORIKAWA --- libs/libupm/Makefile | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index 303b26ba28..b62c581add 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupm PKG_VERSION:=2.0.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/intel-iot-devkit/upm/tar.gz/v$(PKG_VERSION)? @@ -53,7 +53,7 @@ UPM_MODULES:= \ # (require libbacnet) tb7300 t8100 e50hx bacnetmstp # (require libtinyb) 2jciebu01_ble 2jciebu01_usb -CMAKE_OPTIONS=-DBUILDSWIGNODE=$(if $(CONFIG_PACKAGE_libmraa-node),ON,OFF) \ +CMAKE_OPTIONS=-DBUILDSWIGNODE=OFF \ -DPYTHON2LIBS_FOUND=FALSE \ -DPYTHON2INTERP_FOUND=FALSE \ @@ -78,7 +78,6 @@ define Package/libupm TITLE:=Intel IoT sensor library - Full DEPENDS+=+libjpeg +libmodbus +openzwave DEPENDS+= $(foreach module, $(UPM_MODULES), +libupm-$(module)) - DEPENDS+= $(foreach module, $(UPM_MODULES), +libupm-$(module)-node) DEPENDS+= $(foreach module, $(UPM_MODULES), +libupm-$(module)-python3) endef @@ -93,11 +92,6 @@ define Package/libupm/install/Default $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupm*-$(2).so* $(1)/usr/lib/ ; endef -define Package/libupm/install/Default-node - $(INSTALL_DIR) $(1)/usr/lib/node/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/jsupm_$(2) $(1)/usr/lib/node/ ; -endef - define Package/libupm/install/Default-python3 $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/upm $(CP) $(CMAKE_BINARY_DIR)/$(if $(filter interfaces, $(2)),,src/)$(2)/python$(PYTHON3_VERSION)/pyupm_$(2).py \ @@ -109,7 +103,6 @@ endef define Package/libupm/install $(foreach module, $(UPM_MODULES), \ $(call Package/libupm/install/Default,$(1),$(module)) \ - $(call Package/libupm/install/Default-node,$(1),$(module)) \ $(call Package/libupm/install/Default-python3,$(1),$(module))) endef @@ -345,19 +338,6 @@ $(call Package/libupm/Default/description) This package contains $(1) sensor C/C++ library endef -define Package/libupm-$(1)-node - $(call Package/libupm/Default) - $(call UpmPackage/depends,$(1)) - TITLE:=$(1) Node.js library - DEPENDS+=+libupm-$(1) +libmraa-node -endef - -define Package/libupm-$(1)-node/description -$(call Package/libupm/Default/description) - -This package contains $(1) sensor Node.js library -endef - define Package/libupm-$(1)-python3 $(call Package/libupm/Default) $(call UpmPackage/depends,$(1)) @@ -374,9 +354,6 @@ endef define Package/libupm-$(1)/install $(call Package/libupm/install/Default,$$(1),$(1)) endef -define Package/libupm-$(1)-node/install - $(call Package/libupm/install/Default-node,$$(1),$(1)) -endef define Package/libupm-$(1)-python3/install $(call Package/libupm/install/Default-python3,$$(1),$(1)) endef @@ -386,5 +363,4 @@ $(eval $(call BuildPackage,libupm)) $(foreach module, $(UPM_MODULES), \ $(eval $(call UpmPackage,$(module))) \ $(eval $(call BuildPackage,libupm-$(module))) \ - $(eval $(call BuildPackage,libupm-$(module)-node)) \ $(eval $(call BuildPackage,libupm-$(module)-python3))) -- 2.30.2