From 691fd79538e641b87b96b1e35c98519bf9811bea Mon Sep 17 00:00:00 2001
From: j1nx
Date: Wed, 9 Jun 2021 20:50:27 +0200
Subject: [PATCH] Add skill-news as pre installed skill
---
buildroot-external/Config.in | 3 +++
.../configs/rpi4_64-gui_defconfig | 4 +++-
.../package/mycroft-skill-news/Config.in | 6 ++++++
.../mycroft-skill-news/mycroft-skill-news.mk | 20 +++++++++++++++++++
.../package/python-url-normalize/Config.in | 7 +++++++
.../python-url-normalize.hash | 5 +++++
.../python-url-normalize.mk | 14 +++++++++++++
.../package/python-youtube-searcher/Config.in | 9 +++++++++
.../python-youtube-searcher.hash | 3 +++
.../python-youtube-searcher.mk | 13 ++++++++++++
10 files changed, 83 insertions(+), 1 deletion(-)
create mode 100644 buildroot-external/package/mycroft-skill-news/Config.in
create mode 100644 buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk
create mode 100644 buildroot-external/package/python-url-normalize/Config.in
create mode 100644 buildroot-external/package/python-url-normalize/python-url-normalize.hash
create mode 100644 buildroot-external/package/python-url-normalize/python-url-normalize.mk
create mode 100644 buildroot-external/package/python-youtube-searcher/Config.in
create mode 100644 buildroot-external/package/python-youtube-searcher/python-youtube-searcher.hash
create mode 100644 buildroot-external/package/python-youtube-searcher/python-youtube-searcher.mk
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 1b76ba39..b002d384 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -181,12 +181,14 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-tzlocal/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-unidecode/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-uritemplate/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-url-normalize/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-vlc/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-wikipedia-api/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-wikipedia-for-humans/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-xmlrunner/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-xxhash/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-youtube-dl/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-youtube-searcher/Config.in"
endmenu
menu "Mycroft A.I. Personal Assistant"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-embedded-shell/Config.in"
@@ -211,6 +213,7 @@ menu "Mycroft A.I. Skills"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ddg/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-installer/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-naptime/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-news/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-enclosure/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-homescreen/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-mycroftgui/Config.in"
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 5b874259..df27360f 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -589,17 +589,18 @@ BR2_PACKAGE_PYTHON_PYOWM=y
BR2_PACKAGE_PYTHON_QUANTULUM3=y
BR2_PACKAGE_PYTHON_RAKEKEYWORDS=y
BR2_PACKAGE_PYTHON_RAPIDFUZZ=y
-BR2_PACKAGE_PYTHON_REQUESTS_CACHE=y
BR2_PACKAGE_PYTHON_REQUESTS_FUTURES=y
BR2_PACKAGE_PYTHON_SGMLLIB3K=y
BR2_PACKAGE_PYTHON_SMBUS2=y
BR2_PACKAGE_PYTHON_SMMAP=y
BR2_PACKAGE_PYTHON_SOURCE=y
BR2_PACKAGE_PYTHON_TZLOCAL=y
+BR2_PACKAGE_PYTHON_URL_NORMALIZE=y
BR2_PACKAGE_PYTHON_VLC=y
BR2_PACKAGE_PYTHON_WIKIPEDIA_FOR_HUMANS=y
BR2_PACKAGE_PYTHON_XMLRUNNER=y
BR2_PACKAGE_PYTHON_YOUTUBE_DL=y
+BR2_PACKAGE_PYTHON_YOUTUBE_SEARCHER=y
BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y
BR2_PACKAGE_MYCROFT_GUI=y
BR2_PACKAGE_PYTHON_HOLMESV=y
@@ -618,6 +619,7 @@ BR2_PACKAGE_MYCROFT_SKILL_DATE_TIME=y
BR2_PACKAGE_MYCROFT_SKILL_DDG=y
BR2_PACKAGE_MYCROFT_SKILL_INSTALLER=y
BR2_PACKAGE_MYCROFT_SKILL_NAPTIME=y
+BR2_PACKAGE_MYCROFT_SKILL_NEWS=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_ENCLOSURE=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_MYCROFTGUI=y
diff --git a/buildroot-external/package/mycroft-skill-news/Config.in b/buildroot-external/package/mycroft-skill-news/Config.in
new file mode 100644
index 00000000..299e6885
--- /dev/null
+++ b/buildroot-external/package/mycroft-skill-news/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MYCROFT_SKILL_NEWS
+ bool "mycroft-skill-news"
+ help
+ News Streams from around the globe
+
+ https://github.com/JarbasSkills/skill-news
diff --git a/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk b/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk
new file mode 100644
index 00000000..886d8e13
--- /dev/null
+++ b/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# mycroft-skill-news
+#
+################################################################################
+
+MYCROFT_SKILL_NEWS_VERSION = 7787ad242967064a56f61f96547fd098881ab786
+MYCROFT_SKILL_NEWS_SITE = git://github.com/JarbasSkills/skill-news
+MYCROFT_SKILL_NEWS_SITE_METHOD = git
+MYCROFT_SKILL_NEWS_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
+MYCROFT_SKILL_NEWS_DIRNAME = skill-news.jarbasskills
+
+define MYCROFT_SKILL_NEWS_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_NEWS_DIRLOCATION)/$(MYCROFT_SKILL_NEWS_DIRNAME)
+ cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_NEWS_DIRLOCATION)/$(MYCROFT_SKILL_NEWS_DIRNAME)
+ cp -dpfr $(MYCROFT_SKILL_NEWS_DL_DIR)/git/.git* \
+ $(TARGET_DIR)/$(MYCROFT_SKILL_NEWS_DIRLOCATION)/$(MYCROFT_SKILL_NEWS_DIRNAME)
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot-external/package/python-url-normalize/Config.in b/buildroot-external/package/python-url-normalize/Config.in
new file mode 100644
index 00000000..6cc60a03
--- /dev/null
+++ b/buildroot-external/package/python-url-normalize/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_URL_NORMALIZE
+ bool "python-url-normalize"
+ select BR2_PACKAGE_PYTHON_SIX # runtime
+ help
+ URL normalization for Python.
+
+ https://github.com/niksite/url-normalize
diff --git a/buildroot-external/package/python-url-normalize/python-url-normalize.hash b/buildroot-external/package/python-url-normalize/python-url-normalize.hash
new file mode 100644
index 00000000..4251ca0c
--- /dev/null
+++ b/buildroot-external/package/python-url-normalize/python-url-normalize.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/url-normalize/json
+md5 3e72f94de0c4a98f8ea76cd99cf105d9 url-normalize-1.4.3.tar.gz
+sha256 d23d3a070ac52a67b83a1c59a0e68f8608d1cd538783b401bc9de2c0fac999b2 url-normalize-1.4.3.tar.gz
+# Locally computed sha256 checksums
+sha256 c7cbebc0c12ff2344959f1f5e39b17becd155388cfada571dbb1d0cd29fbc23e LICENSE
diff --git a/buildroot-external/package/python-url-normalize/python-url-normalize.mk b/buildroot-external/package/python-url-normalize/python-url-normalize.mk
new file mode 100644
index 00000000..11713890
--- /dev/null
+++ b/buildroot-external/package/python-url-normalize/python-url-normalize.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-url-normalize
+#
+################################################################################
+
+PYTHON_URL_NORMALIZE_VERSION = 1.4.3
+PYTHON_URL_NORMALIZE_SOURCE = url-normalize-$(PYTHON_URL_NORMALIZE_VERSION).tar.gz
+PYTHON_URL_NORMALIZE_SITE = https://files.pythonhosted.org/packages/ec/ea/780a38c99fef750897158c0afb83b979def3b379aaac28b31538d24c4e8f
+PYTHON_URL_NORMALIZE_SETUP_TYPE = setuptools
+PYTHON_URL_NORMALIZE_LICENSE = MIT
+PYTHON_URL_NORMALIZE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-youtube-searcher/Config.in b/buildroot-external/package/python-youtube-searcher/Config.in
new file mode 100644
index 00000000..28a271eb
--- /dev/null
+++ b/buildroot-external/package/python-youtube-searcher/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_YOUTUBE_SEARCHER
+ bool "python-youtube-searcher"
+ select BR2_PACKAGE_PYTHON_BS4 # runtime
+ select BR2_PACKAGE_PYTHON_REQUESTS # runtime
+ select BR2_PACKAGE_PYTHON_REQUESTS_CACHE # runtime
+ help
+ search youtube.
+
+ https://github.com/HelloChatterbox/youtube_searcher
diff --git a/buildroot-external/package/python-youtube-searcher/python-youtube-searcher.hash b/buildroot-external/package/python-youtube-searcher/python-youtube-searcher.hash
new file mode 100644
index 00000000..dcd42331
--- /dev/null
+++ b/buildroot-external/package/python-youtube-searcher/python-youtube-searcher.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/youtube_searcher/json
+md5 9ec3a351fd11c93dde4e72695e55b4be youtube_searcher-0.1.6.tar.gz
+sha256 bfd77117625283cfece5221e511c0c9dcc1901b67ed0487b32e817803102af26 youtube_searcher-0.1.6.tar.gz
diff --git a/buildroot-external/package/python-youtube-searcher/python-youtube-searcher.mk b/buildroot-external/package/python-youtube-searcher/python-youtube-searcher.mk
new file mode 100644
index 00000000..c23d6c9d
--- /dev/null
+++ b/buildroot-external/package/python-youtube-searcher/python-youtube-searcher.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-youtube-searcher
+#
+################################################################################
+
+PYTHON_YOUTUBE_SEARCHER_VERSION = 0.1.6
+PYTHON_YOUTUBE_SEARCHER_SOURCE = youtube_searcher-$(PYTHON_YOUTUBE_SEARCHER_VERSION).tar.gz
+PYTHON_YOUTUBE_SEARCHER_SITE = https://files.pythonhosted.org/packages/e9/7c/c95ce24b6f36d51cc5c41b79265ca5181157a455d95a7c958bc082cfe8c4
+PYTHON_YOUTUBE_SEARCHER_SETUP_TYPE = setuptools
+PYTHON_YOUTUBE_SEARCHER_LICENSE = Apache
+
+$(eval $(python-package))