rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-02-11 09:20:44 +01:00
Code Issues Releases Wiki Activity

Switch mycroft-core over to mycroft-lib

Browse Source 
(Leave the old package in place for now)
This commit is contained in:
j1nx 2021-04-14 13:43:16 +02:00
parent ec5d89b129
commit e94acd468e
6 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/Config.in
View File

@ -170,7 +170,7 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-xxhash/Config.in"
endmenu
menu "Mycroft A.I. Personal Assistant"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mycroft/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mycroft-lib/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-embedded-shell/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-gui/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-service/Config.in"

2
buildroot-external/configs/rpi4_64-gui_defconfig
View File

@ -582,7 +582,7 @@ BR2_PACKAGE_PYTHON_SOURCE=y
BR2_PACKAGE_PYTHON_TZLOCAL=y
BR2_PACKAGE_PYTHON_VLC=y
BR2_PACKAGE_PYTHON_XMLRUNNER=y
BR2_PACKAGE_PYTHON_MYCROFT=y
BR2_PACKAGE_PYTHON_MYCROFT_LIB=y
BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y
BR2_PACKAGE_MYCROFT_GUI=y
BR2_PACKAGE_MYCROFT_SERVICE=y

36
buildroot-external/package/python-mycroft-lib/0001-Add-entry_points-to-install-binaries.patch Normal file
View File

@ -0,0 +1,36 @@
From f44c0d90512660912920d7d7d0ec1801a336b716 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Wed, 14 Apr 2021 13:38:04 +0200
Subject: [PATCH 1/1] Add entry_points for binaries
---
setup.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 7c9f368d..87ab8618 100644
--- a/setup.py
+++ b/setup.py
@@ -67,5 +67,18 @@ setup(
},
packages=find_packages(include=['mycroft*']),
- include_package_data=True
+ include_package_data=True,
+
+ entry_points={
+ 'console_scripts': [
+ 'mycroft-speech-client=mycroft.client.speech.__main__:main',
+ 'mycroft-messagebus=mycroft.messagebus.service.__main__:main',
+ 'mycroft-skills=mycroft.skills.__main__:main',
+ 'mycroft-audio=mycroft.audio.__main__:main',
+ 'mycroft-echo-observer=mycroft.messagebus.client.ws:echo',
+ 'mycroft-audio-test=mycroft.util.audio_test:main',
+ 'mycroft-enclosure-client=mycroft.client.enclosure.__main__:main',
+ 'mycroft-cli-client=mycroft.client.text.__main__:main'
+ ]
+ }
)
--
2.20.1

7
buildroot-external/package/python-mycroft-lib/Config.in Normal file
View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_PYTHON_MYCROFT_LIB
bool "python-mycroft-lib"
help
Mycroft Core, the Mycroft Artificial Intelligence platform.
packaged as importable library.
https://mycroft.ai/

1
buildroot-external/package/python-mycroft-lib/python-mycroft-lib.hash Normal file
View File

@ -0,0 +1 @@
sha256 08807761dcedaff03c0b2eb2dc1d72ad56ae82802f9086ba45a519825c7882d7 python-mycroft-lib-ab6ac7713ecc2bf4eb0430ea05dfcf06bbc5dd3a.tar.gz

12
buildroot-external/package/python-mycroft-lib/python-mycroft-lib.mk Normal file
View File

@ -0,0 +1,12 @@
################################################################################
#
# python-mycroft-lib
#
################################################################################
PYTHON_MYCROFT_LIB_VERSION = ab6ac7713ecc2bf4eb0430ea05dfcf06bbc5dd3a
PYTHON_MYCROFT_LIB_SITE = $(call github,HelloChatterbox,mycroft-lib,$(PYTHON_MYCROFT_LIB_VERSION))
PYTHON_MYCROFT_LIB_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LIB_LICENSE_FILES = LICENSE
$(eval $(python-package))