From a7668c583b0ee316db15fe1c41694e0f8b51e6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 18 Feb 2020 15:44:18 +0100 Subject: [PATCH] bigclown: use pypi.mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Convert bigclown packages to use pypi.mk and pypi in general instead of github. This allows us to remove version replacement as that is already done in pypi archive. Updated dependencies to also contain proxy dependencies that are listed in upstream. Signed-off-by: Karel Kočí --- utils/bigclown/bigclown-control-tool/Makefile | 35 +++++++++-------- .../bigclown/bigclown-firmware-tool/Makefile | 19 ++++------ utils/bigclown/bigclown-gateway/Makefile | 32 ++++++++-------- .../bigclown/bigclown-mqtt2influxdb/Makefile | 38 ++++++++++--------- 4 files changed, 61 insertions(+), 63 deletions(-) diff --git a/utils/bigclown/bigclown-control-tool/Makefile b/utils/bigclown/bigclown-control-tool/Makefile index e9ec484d45..100a3be779 100644 --- a/utils/bigclown/bigclown-control-tool/Makefile +++ b/utils/bigclown/bigclown-control-tool/Makefile @@ -8,29 +8,32 @@ PKG_NAME:=bigclown-control-tool PKG_VERSION:=0.2.0 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://codeload.github.com/bigclownlabs/bch-control-tool/tar.gz/v$(PKG_VERSION)? -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=c79a76e0940958e4ddcf51e57fadfb127f568b6c1ceb02033c3630bab2dee612 -PKG_LICENSE:=MIT -PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/bch-control-tool-$(PKG_VERSION) +PYPI_NAME:=bch +PKG_HASH:=4cd73b92757fce7275a4744baed411c867af2e671c521b90d6690b2320851d58 +PKG_MAINTAINER:=Karel Kočí +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include ../../../lang/python/pypi.mk include $(INCLUDE_DIR)/package.mk include ../../../lang/python/python3-package.mk -define Package/$(PKG_NAME) +define Package/bigclown-control-tool SECTION:=utils CATEGORY:=Utilities SUBMENU:=BigClown - URL:=https://github.com/bigclownlabs/bch-control-tool TITLE:=BigCLown control tool - DEPENDS:=+python3-click-log +python3-paho-mqtt +python3-pyserial +python3-yaml +python3-simplejson + URL:=https://github.com/bigclownlabs/bch-control-tool + DEPENDS:=\ + +python3-click \ + +python3-click-log \ + +python3-paho-mqtt \ + +python3-pyserial \ + +python3-yaml \ + +python3-simplejson + VARIANT:=python3 endef -define Build/Compile - sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" - $(call Py3Build/Compile/Default) -endef - -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call Py3Package,bigclown-control-tool)) +$(eval $(call BuildPackage,bigclown-control-tool)) diff --git a/utils/bigclown/bigclown-firmware-tool/Makefile b/utils/bigclown/bigclown-firmware-tool/Makefile index 8f679f4cb6..c9a6ce943a 100644 --- a/utils/bigclown/bigclown-firmware-tool/Makefile +++ b/utils/bigclown/bigclown-firmware-tool/Makefile @@ -8,19 +8,18 @@ PKG_NAME:=bigclown-firmware-tool PKG_VERSION:=1.5.1 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/bigclownlabs/bch-firmware-tool/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e37d2a9ecb50cef9274801092fe1345e9bdf092cdc0da4747edb80d262fc2905 -PKG_BUILD_DIR:=$(BUILD_DIR)/bch-firmware-tool-$(PKG_VERSION) +PYPI_NAME:=bcf +PKG_HASH:=50b0351b97e6b1b1d4cb4703491daa6102e7e5b3b750b47fa35182d9eb39ab9c PKG_MAINTAINER:=Karel Kočí PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE +include ../../../lang/python/pypi.mk include $(INCLUDE_DIR)/package.mk include ../../../lang/python/python3-package.mk -define Package/$(PKG_NAME) +define Package/bigclown-firmware-tool SECTION:=utils CATEGORY:=Utilities SUBMENU:=BigClown @@ -35,12 +34,8 @@ define Package/$(PKG_NAME) +python3-requests \ +python3-click \ +python3-intelhex + VARIANT:=python3 endef -define Build/Compile - sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" - $(call Py3Build/Compile/Default) -endef - -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call Py3Package,bigclown-firmware-tool)) +$(eval $(call BuildPackage,bigclown-firmware-tool)) diff --git a/utils/bigclown/bigclown-gateway/Makefile b/utils/bigclown/bigclown-gateway/Makefile index 55ddefbd9f..1419d16f9c 100644 --- a/utils/bigclown/bigclown-gateway/Makefile +++ b/utils/bigclown/bigclown-gateway/Makefile @@ -8,25 +8,27 @@ PKG_NAME:=bigclown-gateway PKG_VERSION:=1.16.2 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://codeload.github.com/bigclownlabs/bch-gateway/tar.gz/v$(PKG_VERSION)? -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=9d3208bf4cffec507d992485104fcbba2b9bc02cf7b290dfe13f98e5916ee1ca -PKG_LICENSE:=MIT -PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/bch-gateway-$(PKG_VERSION) +PYPI_NAME:=bcg +PKG_HASH:=ce7f27f372551c0beb3f8929af2d779417d9dcd0feaa2fa2dc49e87b1416c536 +PKG_MAINTAINER:=Karel Kočí +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include ../../../lang/python/pypi.mk include $(INCLUDE_DIR)/package.mk include ../../../lang/python/python3-package.mk -define Package/$(PKG_NAME) +define Package/bigclown-gateway SECTION:=utils CATEGORY:=Utilities SUBMENU:=BigClown - URL:=https://github.com/bigclownlabs/bch-gateway TITLE:=BigCLown gateway + URL:=https://github.com/bigclownlabs/bch-gateway DEPENDS:= \ +kmod-usb-serial-ftdi \ +kmod-usb-acm \ + +python3-click \ +python3-click-log \ +python3-paho-mqtt \ +python3-pyserial \ @@ -34,9 +36,10 @@ define Package/$(PKG_NAME) +python3-simplejson \ +python3-schema \ +python3-appdirs + VARIANT:=python3 endef -define Py3Package/$(PKG_NAME)/install +define Py3Package/bigclown-gateway/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ @@ -46,14 +49,9 @@ define Py3Package/$(PKG_NAME)/install $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bigclown-gateway endef -define Package/$(PKG_NAME)/conffiles +define Package/bigclown-gateway/conffiles /etc/config/bigclown-gateway endef -define Build/Compile - sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" - $(call Py3Build/Compile/Default) -endef - -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call Py3Package,bigclown-gateway)) +$(eval $(call BuildPackage,bigclown-gateway)) diff --git a/utils/bigclown/bigclown-mqtt2influxdb/Makefile b/utils/bigclown/bigclown-mqtt2influxdb/Makefile index 38f317a656..c405ba8bd7 100644 --- a/utils/bigclown/bigclown-mqtt2influxdb/Makefile +++ b/utils/bigclown/bigclown-mqtt2influxdb/Makefile @@ -8,26 +8,33 @@ PKG_NAME:=bigclown-mqtt2influxdb PKG_VERSION:=1.3.0 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://codeload.github.com/bigclownlabs/bch-mqtt2influxdb/tar.gz/v$(PKG_VERSION)? -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=56e1de1f83cb2c5fd5f280c29917c5c25021c36311075c12414733dd0d701697 -PKG_LICENSE:=MIT -PKG_MAINTAINER:=Karel Kočí -PKG_BUILD_DIR:=$(BUILD_DIR)/bch-mqtt2influxdb-$(PKG_VERSION) +PYPI_NAME:=mqtt2influxdb +PKG_HASH:=1b4b3b13f5b2f092bcd27846d94e91ad6f05141b2daea5167a7d58b09a782639 +PKG_MAINTAINER:=Karel Kočí +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include ../../../lang/python/pypi.mk include $(INCLUDE_DIR)/package.mk include ../../../lang/python/python3-package.mk -define Package/$(PKG_NAME) +define Package/bigclown-mqtt2influxdb SECTION:=utils CATEGORY:=Utilities SUBMENU:=BigClown - URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3-paho-mqtt +python3-yaml +python3-influxdb +python3-jsonpath-ng +python3-schema + URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb + DEPENDS:= \ + +python3-paho-mqtt \ + +python3-yaml \ + +python3-influxdb \ + +python3-jsonpath-ng \ + +python3-schema + VARIANT:=python3 endef -define Py3Package/$(PKG_NAME)/install +define Py3Package/bigclown-mqtt2influxdb/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ @@ -36,14 +43,9 @@ define Py3Package/$(PKG_NAME)/install $(INSTALL_DATA) ./files/config.yml $(1)/etc/bigclown-mqtt2influxdb.yml endef -define Package/$(PKG_NAME)/conffiles +define Package/bigclown-mqtt2influxdb/conffiles /etc/bigclown-mqtt2influxdb.yml endef -define Build/Compile - sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" - $(call Py3Build/Compile/Default) -endef - -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call Py3Package,bigclown-mqtt2influxdb)) +$(eval $(call BuildPackage,bigclown-mqtt2influxdb))