From 955bc3944542a7bdf192da44e0f0218c0aed28f5 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 15 Mar 2022 12:51:01 +0100 Subject: [PATCH] Switch balena wifi over to PHAL version --- buildroot-external/Config.in | 2 +- buildroot-external/configs/rpi3_64-gui_defconfig | 2 +- buildroot-external/configs/rpi4_64-gui_defconfig | 2 +- .../python-ovos-phal-plugin-balena-wifi/Config.in | 6 ++++++ .../python-ovos-phal-plugin-balena-wifi.hash | 1 + .../python-ovos-phal-plugin-balena-wifi.mk | 12 ++++++++++++ .../rootfs-overlay/etc/mycroft/mycroft.conf | 1 - 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 buildroot-external/package/python-ovos-phal-plugin-balena-wifi/Config.in create mode 100644 buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.hash create mode 100644 buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index b7ae4a6a..d0a0f5fc 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -247,6 +247,7 @@ menu "Mycroft A.I. Plugins" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-notifications-service/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ocp-audio-plugin/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-balena-wifi/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-connectivity-events/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-display-manager-ipc/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-ipc2bus/Config.in" @@ -271,7 +272,6 @@ menu "Mycroft A.I. Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skills-repo/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-alarm/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-audio-record/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-balena-wifi-setup/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-camera/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-configuration/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-date-time/Config.in" diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index 87ac389e..bcfedb1d 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -708,6 +708,7 @@ BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y BR2_PACKAGE_PYTHON_OVOS_NOTIFICATIONS_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y BR2_PACKAGE_PYTHON_OVOS_PHAL=y +BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_CONNECTIVITY_EVENTS=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPC2BUS=y @@ -729,7 +730,6 @@ BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE=y BR2_PACKAGE_MYCROFT_SKILLS_REPO=y BR2_PACKAGE_MYCROFT_SKILL_ALARM=y BR2_PACKAGE_MYCROFT_SKILL_AUDIO_RECORD=y -BR2_PACKAGE_MYCROFT_SKILL_BALENA_WIFI_SETUP=y BR2_PACKAGE_MYCROFT_SKILL_CAMERA=y BR2_PACKAGE_MYCROFT_SKILL_CONFIGURATION=y BR2_PACKAGE_MYCROFT_SKILL_DATE_TIME=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 83893a5b..04e7ad6f 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -710,6 +710,7 @@ BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y BR2_PACKAGE_PYTHON_OVOS_NOTIFICATIONS_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y BR2_PACKAGE_PYTHON_OVOS_PHAL=y +BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_CONNECTIVITY_EVENTS=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPC2BUS=y @@ -731,7 +732,6 @@ BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE=y BR2_PACKAGE_MYCROFT_SKILLS_REPO=y BR2_PACKAGE_MYCROFT_SKILL_ALARM=y BR2_PACKAGE_MYCROFT_SKILL_AUDIO_RECORD=y -BR2_PACKAGE_MYCROFT_SKILL_BALENA_WIFI_SETUP=y BR2_PACKAGE_MYCROFT_SKILL_CAMERA=y BR2_PACKAGE_MYCROFT_SKILL_CONFIGURATION=y BR2_PACKAGE_MYCROFT_SKILL_DATE_TIME=y diff --git a/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/Config.in b/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/Config.in new file mode 100644 index 00000000..c871240f --- /dev/null +++ b/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI + bool "python-ovos-phal-plugin-balena-wifi" + help + OVOS-PHAL Balena WIFI setup + + https://github.com/OpenVoiceOS/ovos-PHAL-plugin-balena-wifi diff --git a/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.hash b/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.hash new file mode 100644 index 00000000..18cb072f --- /dev/null +++ b/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.hash @@ -0,0 +1 @@ +sha256 c079e5cfea0a8dba4f04e51a3717715ba462f1dc0d06bb922e118ca4fb1400be python-ovos-phal-plugin-balena-wifi-560b54241f8c29880d316e87205c9e6d69889a01.tar.gz diff --git a/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.mk b/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.mk new file mode 100644 index 00000000..8708a7ad --- /dev/null +++ b/buildroot-external/package/python-ovos-phal-plugin-balena-wifi/python-ovos-phal-plugin-balena-wifi.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-ovos-phal-plugin-balena-wifi +# +################################################################################ + +PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI_VERSION = 560b54241f8c29880d316e87205c9e6d69889a01 +PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI_SITE = $(call github,OpenVoiceOS,ovos-PHAL-plugin-balena-wifi,$(PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI_VERSION)) +PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI_SETUP_TYPE = setuptools +PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf index 1767436b..c34ae06a 100644 --- a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf +++ b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf @@ -34,7 +34,6 @@ ], "priority_skills": [ "skill-ovos-setup.openvoiceos", - "skill-balena-wifi-setup.openvoiceos", "skill-ovos-volume.openvoiceos", "skill-weather.openvoiceos", "ovos-skills-info.openvoiceos"