Updated buildroot packages

superbox-dev · Jun 7, 2022 · 786526d · 786526d
1 parent 3a0f44b
commit 786526d
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 84 deletions.
diff --git a/buildroot/Config.in b/buildroot/Config.in
@@ -1,11 +1,12 @@
-comment "Base packages"
+comment "Unipi packages"
 source "$BR2_EXTERNAL_UNIPI_PATH/package/unipi-control/Config.in"
-source "$BR2_EXTERNAL_UNIPI_PATH/package/unipi-python-asyncio-mqtt/Config.in"
-source "$BR2_EXTERNAL_UNIPI_PATH/package/unipi-python-paho-mqtt/Config.in"
 source "$BR2_EXTERNAL_UNIPI_PATH/package/unipi-kernel/Config.in"
 source "$BR2_EXTERNAL_UNIPI_PATH/package/unipi-tools/Config.in"
 
+comment "External python modules"
+source "$BR2_EXTERNAL_UNIPI_PATH/package/custom-python-asyncio-mqtt/Config.in"
+source "$BR2_EXTERNAL_UNIPI_PATH/package/custom-python-paho-mqtt/Config.in"
+
 comment "Shell optimizations"
 source "$BR2_EXTERNAL_UNIPI_PATH/package/zsh-autosuggestions/Config.in"
 source "$BR2_EXTERNAL_UNIPI_PATH/package/zsh-history-substring-search/Config.in"
-source "$BR2_EXTERNAL_UNIPI_PATH/package/zsh-syntax-highlighting/Config.in"
diff --git a/buildroot/board/common/rootfs_overlay/etc/zshrc b/buildroot/board/common/rootfs_overlay/etc/zshrc
@@ -21,7 +21,6 @@ setopt zle
 ################################################################################
 # PLUGINS
 
-# source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 source /usr/share/zsh-history-substring-search/zsh-history-substring-search.zsh
 

diff --git a/buildroot/package/custom-python-asyncio-mqtt/Config.in b/buildroot/package/custom-python-asyncio-mqtt/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CUSTOM_PYTHON_ASYNCIO_MQTT
+	bool "python-asyncio-mqtt"
+	select BR2_PACKAGE_CUSTOM_PYTHON_PAHO_MQTT
+
+	help
+	  Idomatic asyncio wrapper around paho-mqtt
+
+	  https://github.com/sbtinstruments/asyncio-mqtt
diff --git a/...yncio-mqtt/unipi-python-asyncio-mqtt.hash → ...ncio-mqtt/custom-python-asyncio-mqtt.hash b/...yncio-mqtt/unipi-python-asyncio-mqtt.hash → ...ncio-mqtt/custom-python-asyncio-mqtt.hash
diff --git a/buildroot/package/custom-python-asyncio-mqtt/custom-python-asyncio-mqtt.mk b/buildroot/package/custom-python-asyncio-mqtt/custom-python-asyncio-mqtt.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# custom-python-asyncio-mqtt
+#
+################################################################################
+
+CUSTOM_PYTHON_ASYNCIO_MQTT_VERSION = 0.12.1
+CUSTOM_PYTHON_ASYNCIO_MQTT_SOURCE = v$(CUSTOM_PYTHON_ASYNCIO_MQTT_VERSION).tar.gz
+CUSTOM_PYTHON_ASYNCIO_MQTT_SITE = https://github.com/sbtinstruments/asyncio-mqtt/archive/refs/tags
+CUSTOM_PYTHON_ASYNCIO_MQTT_SETUP_TYPE = setuptools
+CUSTOM_PYTHON_ASYNCIO_MQTT_LICENSE = BSD-3-Clause
+CUSTOM_PYTHON_ASYNCIO_MQTT_LICENSE_FILES = LICENCE
+
+$(eval $(python-package))
diff --git a/.../package/unipi-python-paho-mqtt/Config.in → ...package/custom-python-paho-mqtt/Config.in b/.../package/unipi-python-paho-mqtt/Config.in → ...package/custom-python-paho-mqtt/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_UNIPI_PYTHON_PAHO_MQTT
-	bool "Unipi Control python-paho-mytt"
+config BR2_PACKAGE_CUSTOM_PYTHON_PAHO_MQTT
+	bool "python-paho-mytt"
 
 	help
 	  MQTT version 5.0/3.1.1 client class

diff --git a/...hon-paho-mqtt/unipi-python-paho-mqtt.hash → ...on-paho-mqtt/custom-python-paho-mqtt.hash b/...hon-paho-mqtt/unipi-python-paho-mqtt.hash → ...on-paho-mqtt/custom-python-paho-mqtt.hash
diff --git a/buildroot/package/custom-python-paho-mqtt/custom-python-paho-mqtt.mk b/buildroot/package/custom-python-paho-mqtt/custom-python-paho-mqtt.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# custom-python-paho-mqtt
+#
+################################################################################
+
+CUSTOM_PYTHON_PAHO_MQTT_VERSION = 1.6.1
+CUSTOM_PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(CUSTOM_PYTHON_PAHO_MQTT_VERSION).tar.gz
+CUSTOM_PYTHON_PAHO_MQTT_SITE = https://files.pythonhosted.org/packages/f8/dd/4b75dcba025f8647bc9862ac17299e0d7d12d3beadbf026d8c8d74215c12
+CUSTOM_PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools
+CUSTOM_PYTHON_PAHO_MQTT_LICENSE = OSI Approved
+
+$(eval $(python-package))
diff --git a/buildroot/package/unipi-control/Config.in b/buildroot/package/unipi-control/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_UNIPI_CONTROL
-	bool "Unipi Control"
-	select BR2_PACKAGE_UNIPI_PYTHON_ASYNCIO_MQTT
-	select BR2_PACKAGE_UNIPI_PYTHON_PAHO_MQTT
-	select BR2_PACKAGE_UNIPI_PYMODBUS
-	select BR2_PACKAGE_UNIPI_PYYAML
+	bool "Unipi control"
+	select BR2_PACKAGE_CUSTOM_PYTHON_ASYNCIO_MQTT
+	select BR2_PACKAGE_CUSTOM_PYTHON_PAHO_MQTT
+	select BR2_PACKAGE_PYTHON_PYMODBUS
+	select BR2_PACKAGE_PYYAML
 	select BR2_PACKAGE_UNIPI_KERNEL 
 	select BR2_PACKAGE_UNIPI_TOOLS
 

diff --git a/buildroot/package/unipi-control/unipi-control.mk b/buildroot/package/unipi-control/unipi-control.mk
@@ -11,10 +11,12 @@ UNIPI_CONTROL_SETUP_TYPE = setuptools
 UNIPI_CONTROL_LICENSE = MIT
 UNIPI_CONTROL_LICENSE_FILES = LICENCE
 
-define UNIPI_CONTROL_INSTALL_TARGET_CMDS
-	cp -rf $(@D)/src/unipi_control/installer/etc/unipi -t $(TARGET_DIR)/etc/unipi
+define UNIPI_CONTROL_INSTALL_CONFIG
+	cp -rf $(@D)/src/unipi_control/installer/etc/unipi -t $(TARGET_DIR)/etc
 endef
 
+UNIPI_CONTROL_POST_INSTALL_TARGET_HOOKS += UNIPI_CONTROL_INSTALL_CONFIG 
+
 define UNIPI_CONTROL_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 $(@D)/src/unipi_control/installer/etc/systemd/system/unipi-control.service \
 	       	$(TARGET_DIR)/etc/systemd/system/unipi-control.service

diff --git a/buildroot/package/unipi-python-asyncio-mqtt/Config.in b/buildroot/package/unipi-python-asyncio-mqtt/Config.in
diff --git a/buildroot/package/unipi-python-asyncio-mqtt/unipi-python-asyncio-mqtt.mk b/buildroot/package/unipi-python-asyncio-mqtt/unipi-python-asyncio-mqtt.mk
diff --git a/buildroot/package/unipi-python-paho-mqtt/unipi-python-paho-mqtt.mk b/buildroot/package/unipi-python-paho-mqtt/unipi-python-paho-mqtt.mk
diff --git a/buildroot/package/zsh-syntax-highlighting/Config.in b/buildroot/package/zsh-syntax-highlighting/Config.in
diff --git a/buildroot/package/zsh-syntax-highlighting/zsh-syntax-highlighting.hash b/buildroot/package/zsh-syntax-highlighting/zsh-syntax-highlighting.hash
diff --git a/buildroot/package/zsh-syntax-highlighting/zsh-syntax-highlighting.mk b/buildroot/package/zsh-syntax-highlighting/zsh-syntax-highlighting.mk