From c7b6b23a063350772210896f7318788f71ed42d8 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Wed, 20 Jan 2021 15:31:27 +0100
Subject: [PATCH] Bump ovos-utils + add python-kthread package
---
buildroot-external/Config.in | 1 +
buildroot-external/configs/rpi4_64-gui_defconfig | 1 +
buildroot-external/package/python-kthread/Config.in | 6 ++++++
.../package/python-kthread/python-kthread.hash | 3 +++
.../package/python-kthread/python-kthread.mk | 12 ++++++++++++
.../package/python-ovos-utils/python-ovos-utils.hash | 2 +-
.../package/python-ovos-utils/python-ovos-utils.mk | 2 +-
7 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 buildroot-external/package/python-kthread/Config.in
create mode 100644 buildroot-external/package/python-kthread/python-kthread.hash
create mode 100644 buildroot-external/package/python-kthread/python-kthread.mk
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 2baecf65..0364bfa7 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -117,6 +117,7 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-holidays/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-humanhash3/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-json-database/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-kthread/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-korean-lunar-calendar/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-lazy/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-levenshtein/Config.in"
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 97855335..9f1b93ed 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -528,6 +528,7 @@ BR2_PACKAGE_PYTHON_GOOGLE_API_PYTHON_CLIENT=y
BR2_PACKAGE_PYTHON_GTTS=y
BR2_PACKAGE_PYTHON_HOLIDAYS=y
BR2_PACKAGE_PYTHON_HUMANHASH3=y
+BR2_PACKAGE_PYTHON_KTHREAD=y
BR2_PACKAGE_PYTHON_LAZY=y
BR2_PACKAGE_PYTHON_LEVENSHTEIN=y
BR2_PACKAGE_PYTHON_LINGUA_FRANCA=y
diff --git a/buildroot-external/package/python-kthread/Config.in b/buildroot-external/package/python-kthread/Config.in
new file mode 100644
index 00000000..bca2ef24
--- /dev/null
+++ b/buildroot-external/package/python-kthread/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_KTHREAD
+ bool "python-kthread"
+ help
+ Killable threads in Python!.
+
+ https://github.com/munshigroup/kthread
diff --git a/buildroot-external/package/python-kthread/python-kthread.hash b/buildroot-external/package/python-kthread/python-kthread.hash
new file mode 100644
index 00000000..c3ce30f0
--- /dev/null
+++ b/buildroot-external/package/python-kthread/python-kthread.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/kthread/json
+md5 5218d687f20d9c158c2cbcda5e73a16d kthread-0.2.2.tar.gz
+sha256 9fb0e4e987854732333e9a15009442e79d665a667a9d24d30460acac0ccb2c8d kthread-0.2.2.tar.gz
diff --git a/buildroot-external/package/python-kthread/python-kthread.mk b/buildroot-external/package/python-kthread/python-kthread.mk
new file mode 100644
index 00000000..0d1ae35e
--- /dev/null
+++ b/buildroot-external/package/python-kthread/python-kthread.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-kthread
+#
+################################################################################
+
+PYTHON_KTHREAD_VERSION = 0.2.2
+PYTHON_KTHREAD_SOURCE = kthread-$(PYTHON_KTHREAD_VERSION).tar.gz
+PYTHON_KTHREAD_SITE = https://files.pythonhosted.org/packages/cc/32/cf425dc4622888376ddac4ee8105bd4a90b18a291a69c63d7bb702cb79bd
+PYTHON_KTHREAD_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash
index 7f522327..a96a986d 100644
--- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash
+++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash
@@ -1 +1 @@
-sha256 6812e9fc86683f5f059d443a1d13bd552ba27d6d54418859e30c9a1ae47de311 python-ovos-utils-a036c6eb3535bdb2dc3bdc6802485c17c3b2d4b1.tar.gz
+sha256 64e36f82300fa4e9c0cf2c4e021fccdf3ad6b84fbb143dfb23cc9dd046ca0734 python-ovos-utils-7216241742abc8bdc4ca5e1a84f3a733c212278d.tar.gz
diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
index b30936aa..87b3ec41 100644
--- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
+++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_OVOS_UTILS_VERSION = a036c6eb3535bdb2dc3bdc6802485c17c3b2d4b1
+PYTHON_OVOS_UTILS_VERSION = 7216241742abc8bdc4ca5e1a84f3a733c212278d
PYTHON_OVOS_UTILS_SITE = $(call github,OpenVoiceOS,ovos_utils,$(PYTHON_OVOS_UTILS_VERSION))
PYTHON_OVOS_UTILS_SETUP_TYPE = setuptools
PYTHON_OVOS_UTILS_LICENSE_FILES = LICENSE