From: Jeffery To <jeffery.to@gmail.com>
Date: Tue, 31 Mar 2020 18:07:10 +0000 (+0800)
Subject: libupm: Remove Python 2 library package
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9c020b1df8c659975c34dac268f8a57c25ac8988;p=feed%2Fpackages.git

libupm: Remove Python 2 library package

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---

diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile
index d9b809e2d9..b63b9d17fb 100644
--- a/libs/libupm/Makefile
+++ b/libs/libupm/Makefile
@@ -27,7 +27,6 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
 include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 UPM_MODULES:= \
@@ -75,7 +74,6 @@ define Package/libupm
   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)-python)
   DEPENDS+= $(foreach module, $(UPM_MODULES), +libupm-$(module)-python3)
 endef
 
@@ -95,14 +93,6 @@ define Package/libupm/install/Default-node
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/jsupm_$(2) $(1)/usr/lib/node/ ;
 endef
 
-define Package/libupm/install/Default-python
-	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm
-	$(CP) $(CMAKE_BINARY_DIR)/$(if $(filter interfaces, $(2)),,src/)$(2)/python$(PYTHON_VERSION)/pyupm_$(2).py \
-		$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm/_pyupm_$(2).so \
-		$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm/ ;
-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 \
@@ -115,7 +105,6 @@ 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-python,$(1),$(module)) \
 		$(call Package/libupm/install/Default-python3,$(1),$(module)))
 endef
 
@@ -364,19 +353,6 @@ $(call Package/libupm/Default/description)
 This package contains $(1) sensor Node.js library
 endef
 
-define Package/libupm-$(1)-python
-  $(call Package/libupm/Default)
-  $(call UpmPackage/depends,$(1))
-  TITLE:=$(1) Python library
-  DEPENDS+=+libupm-$(1) +libmraa-python +python-light
-endef
-
-define Package/libupm-$(1)-python/description
-$(call Package/libupm/Default/description)
-
-This package contains $(1) sensor Python library
-endef
-
 define Package/libupm-$(1)-python3
   $(call Package/libupm/Default)
   $(call UpmPackage/depends,$(1))
@@ -396,9 +372,6 @@ endef
 define Package/libupm-$(1)-node/install
 	$(call Package/libupm/install/Default-node,$$(1),$(1))
 endef
-define Package/libupm-$(1)-python/install
-	$(call Package/libupm/install/Default-python,$$(1),$(1))
-endef
 define Package/libupm-$(1)-python3/install
 	$(call Package/libupm/install/Default-python3,$$(1),$(1))
 endef
@@ -409,5 +382,4 @@ $(foreach module, $(UPM_MODULES), \
 	$(eval $(call UpmPackage,$(module))) \
 	$(eval $(call BuildPackage,libupm-$(module))) \
 	$(eval $(call BuildPackage,libupm-$(module)-node)) \
-	$(eval $(call BuildPackage,libupm-$(module)-python)) \
 	$(eval $(call BuildPackage,libupm-$(module)-python3)))