From 724313be5eec740c07287c59415ed60b00365b0f Mon Sep 17 00:00:00 2001
From: j1nx
Date: Thu, 29 Sep 2022 14:02:47 +0200
Subject: [PATCH] Fixes and additions to get back into shape
---
buildroot-external/Config.in | 1 +
.../board/raspberrypi/config_4_64bit.txt | 3 ++
.../configs/rpi4_64-gui_defconfig | 2 +-
.../package/growdisk-service/growdisk | 22 ++++++------
.../package/python-langcodes/Config.in | 6 ++++
.../python-langcodes/python-langcodes.hash | 5 +++
.../python-langcodes/python-langcodes.mk | 14 ++++++++
.../python-ovos-config/python-ovos-config.mk | 1 +
.../python-ovos-core/python-ovos-core.hash | 2 +-
.../python-ovos-core/python-ovos-core.mk | 2 +-
.../0001-Lower-pyalsaaudio-requirement.patch | 22 ++++++++++++
.../python-ovos-phal-plugin-alsa.mk | 1 +
.../python-ovos-skill-manager.mk | 1 +
.../python-ovos-utils/python-ovos-utils.hash | 2 +-
.../python-ovos-utils/python-ovos-utils.mk | 3 +-
.../0001-Loosen-arrow-requirement.patch | 25 +++++++++++++
.../skill-ovos-homescreen.hash | 2 +-
.../skill-ovos-homescreen.mk | 2 +-
.../0001-Loosen-pyalsaaudio-requirement.patch | 36 +++++++++++++++++++
19 files changed, 134 insertions(+), 18 deletions(-)
create mode 100644 buildroot-external/package/python-langcodes/Config.in
create mode 100644 buildroot-external/package/python-langcodes/python-langcodes.hash
create mode 100644 buildroot-external/package/python-langcodes/python-langcodes.mk
create mode 100644 buildroot-external/package/python-ovos-phal-plugin-alsa/0001-Lower-pyalsaaudio-requirement.patch
create mode 100644 buildroot-external/package/skill-ovos-homescreen/0001-Loosen-arrow-requirement.patch
create mode 100644 buildroot-external/package/skill-ovos-volume/0001-Loosen-pyalsaaudio-requirement.patch
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 18f8c6cd..d18dad39 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -148,6 +148,7 @@ menu "Additional external python modules"
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-langcodes/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-lazy/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-levenshtein/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-lingua-nostra/Config.in"
diff --git a/buildroot-external/board/raspberrypi/config_4_64bit.txt b/buildroot-external/board/raspberrypi/config_4_64bit.txt
index 3b97f770..f713464b 100644
--- a/buildroot-external/board/raspberrypi/config_4_64bit.txt
+++ b/buildroot-external/board/raspberrypi/config_4_64bit.txt
@@ -66,3 +66,6 @@ dtoverlay=gpio-no-irq
# enable 64bits support
arm_64bit=1
+
+# Enable boost from 1.5Ghz to 1.8Ghz on compatible models
+arm_boost=1
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 01359dc3..f00316a0 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -456,7 +456,6 @@ BR2_PACKAGE_CMOCKA=y
BR2_PACKAGE_ELL=y
BR2_PACKAGE_FLATBUFFERS=y
BR2_PACKAGE_GTEST=y
-BR2_PACKAGE_LIBABSEIL_CPP=y
BR2_PACKAGE_LIBCAP_NG=y
BR2_PACKAGE_LINUX_PAM=y
BR2_PACKAGE_PROTOBUF=y
@@ -621,6 +620,7 @@ BR2_PACKAGE_PYTHON_GTTS=y
BR2_PACKAGE_PYTHON_HOLIDAYS=y
BR2_PACKAGE_PYTHON_HUMANHASH3=y
BR2_PACKAGE_PYTHON_KTHREAD=y
+BR2_PACKAGE_PYTHON_LANGCODES=y
BR2_PACKAGE_PYTHON_LAZY=y
BR2_PACKAGE_PYTHON_LEVENSHTEIN=y
BR2_PACKAGE_PYTHON_MEMORY_TEMPFILE=y
diff --git a/buildroot-external/package/growdisk-service/growdisk b/buildroot-external/package/growdisk-service/growdisk
index e2fc1839..4719ccfe 100755
--- a/buildroot-external/package/growdisk-service/growdisk
+++ b/buildroot-external/package/growdisk-service/growdisk
@@ -3,10 +3,10 @@
# Credits to hassos-expand original script
# https://github.com/home-assistant/operating-system/
-DEVICE_ROOTFS="$(findfs UUID=c0932a41-44cf-463b-8152-d43188553ed4)"
-DEVICE_ROOTFS_NAME="$(basename "${DEVICE_ROOTFS}")"
-DEVICE="/dev/$(lsblk -no pkname "${DEVICE_ROOTFS}")"
-PART_NUM="$(cat "/sys/class/block/${DEVICE_ROOTFS_NAME}/partition")"
+DEVICE_OVERLAYFS="$(findfs PARTUUID=f1326040-5236-40eb-b683-aaa100a9afcf)"
+DEVICE_OVERLAYFS_NAME="$(basename "${DEVICE_OVERLAYFS}")"
+DEVICE="/dev/$(lsblk -no pkname "${DEVICE_OVERLAYFS}")"
+PART_NUM="$(cat "/sys/class/block/${DEVICE_OVERLAYFS_NAME}/partition")"
PART_TABLE="$(sfdisk -lqJ "${DEVICE}")"
if sfdisk --verify "${DEVICE}" 2>&1 | grep "The backup GPT table is not on the end of the device."; then
@@ -20,23 +20,23 @@ LAST_USABLE_LBA="$(echo "${PART_TABLE}" | jq -r '.partitiontable.lastlba')"
echo "[INFO] Last usable logical block ${LAST_USABLE_LBA}"
-JQ_FILTER=".partitiontable.partitions[] | select ( .node == \"${DEVICE_ROOTFS}\" ) | .start + .size"
-ROOTFS_PARTITION_END="$(echo "${PART_TABLE}" | jq "${JQ_FILTER}")"
-echo "[INFO] Rootfs partition end block ${ROOTFS_PARTITION_END}"
+JQ_FILTER=".partitiontable.partitions[] | select ( .node == \"${DEVICE_OVERLAYFS}\" ) | .start + .size"
+OVERLAYFS_PARTITION_END="$(echo "${PART_TABLE}" | jq "${JQ_FILTER}")"
+echo "[INFO] Overlayfs partition end block ${OVERLAYFS_PARTITION_END}"
UNUSED_BLOCKS=$(( LAST_USABLE_LBA - DATA_PARTITION_END ))
if [ "${UNUSED_BLOCKS}" -le "16384" ]; then
- echo "[INFO] No resize of rootfs partition needed"
+ echo "[INFO] No resize of overlayfs partition needed"
exit 0
fi
-echo "[INFO] Update rootfs partition ${PART_NUM}"
+echo "[INFO] Update Overlayfs partition ${PART_NUM}"
echo ", +" | sfdisk --no-reread --no-tell-kernel -N "${PART_NUM}" "${DEVICE}"
sfdisk -V "${DEVICE}"
partx -u "${DEVICE}"
udevadm settle
partprobe "${DEVICE}"
-echo "[INFO] Resizing the rootfs partition"
-resize2fs "${DEVICE_ROOTFS}"
+echo "[INFO] Resizing the overlayfs partition"
+resize2fs "${DEVICE_OVERLAYFS}"
echo "[OK]"
diff --git a/buildroot-external/package/python-langcodes/Config.in b/buildroot-external/package/python-langcodes/Config.in
new file mode 100644
index 00000000..d10dcd83
--- /dev/null
+++ b/buildroot-external/package/python-langcodes/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_LANGCODES
+ bool "python-langcodes"
+ help
+ Tools for labeling human languages with IETF language tags.
+
+ https://github.com/rspeer/langcodes
diff --git a/buildroot-external/package/python-langcodes/python-langcodes.hash b/buildroot-external/package/python-langcodes/python-langcodes.hash
new file mode 100644
index 00000000..2ffbb0ce
--- /dev/null
+++ b/buildroot-external/package/python-langcodes/python-langcodes.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/langcodes/json
+md5 c257046ae26f6af4097a14d7612fc8f3 langcodes-3.3.0.tar.gz
+sha256 794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6 langcodes-3.3.0.tar.gz
+# Locally computed sha256 checksums
+sha256 a0cceca169e5eed22f00f4c001c3851026e56cb60632904548889eb79a3c226d LICENSE.txt
diff --git a/buildroot-external/package/python-langcodes/python-langcodes.mk b/buildroot-external/package/python-langcodes/python-langcodes.mk
new file mode 100644
index 00000000..10c5d156
--- /dev/null
+++ b/buildroot-external/package/python-langcodes/python-langcodes.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-langcodes
+#
+################################################################################
+
+PYTHON_LANGCODES_VERSION = 3.3.0
+PYTHON_LANGCODES_SOURCE = langcodes-$(PYTHON_LANGCODES_VERSION).tar.gz
+PYTHON_LANGCODES_SITE = https://files.pythonhosted.org/packages/5f/ec/9955d772ecac0bdfb5d706d64f185ac68bd0d4092acdc2c5a1882c824369
+PYTHON_LANGCODES_SETUP_TYPE = setuptools
+PYTHON_LANGCODES_LICENSE = MIT
+PYTHON_LANGCODES_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-config/python-ovos-config.mk b/buildroot-external/package/python-ovos-config/python-ovos-config.mk
index c8a036e5..1d0fb850 100644
--- a/buildroot-external/package/python-ovos-config/python-ovos-config.mk
+++ b/buildroot-external/package/python-ovos-config/python-ovos-config.mk
@@ -8,5 +8,6 @@ PYTHON_OVOS_CONFIG_VERSION = fe9e3d2a7ad4a23f5b2cdc67705448b28a57db17
PYTHON_OVOS_CONFIG_SITE = $(call github,OpenVoiceOS,ovos-config,$(PYTHON_OVOS_CONFIG_VERSION))
PYTHON_OVOS_CONFIG_SETUP_TYPE = setuptools
PYTHON_OVOS_CONFIG_LICENSE_FILES = LICENSE
+PYTHON_OVOS_CONFIG_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-core/python-ovos-core.hash b/buildroot-external/package/python-ovos-core/python-ovos-core.hash
index 3a69b211..c67dae70 100644
--- a/buildroot-external/package/python-ovos-core/python-ovos-core.hash
+++ b/buildroot-external/package/python-ovos-core/python-ovos-core.hash
@@ -1 +1 @@
-sha256 461c35e69d1401adee4b143d8dc192905a8d1768f24f99c6800b2b121c487d77 python-ovos-core-def54fbb413aa424da8b60320c93383833fef51e.tar.gz
+sha256 cd287787d8f5aee28a7bb3ba9cdd8d2a86ce00679aabfde79feb7879298c580a python-ovos-core-f21004125fcc26f85d2c4236b0f1c9bb40a8950d.tar.gz
diff --git a/buildroot-external/package/python-ovos-core/python-ovos-core.mk b/buildroot-external/package/python-ovos-core/python-ovos-core.mk
index 601fd73f..95b22a5e 100644
--- a/buildroot-external/package/python-ovos-core/python-ovos-core.mk
+++ b/buildroot-external/package/python-ovos-core/python-ovos-core.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_OVOS_CORE_VERSION = def54fbb413aa424da8b60320c93383833fef51e
+PYTHON_OVOS_CORE_VERSION = f21004125fcc26f85d2c4236b0f1c9bb40a8950d
PYTHON_OVOS_CORE_SITE = $(call github,OpenVoiceOS,ovos-core,$(PYTHON_OVOS_CORE_VERSION))
PYTHON_OVOS_CORE_SETUP_TYPE = setuptools
PYTHON_OVOS_CORE_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-ovos-phal-plugin-alsa/0001-Lower-pyalsaaudio-requirement.patch b/buildroot-external/package/python-ovos-phal-plugin-alsa/0001-Lower-pyalsaaudio-requirement.patch
new file mode 100644
index 00000000..7884c585
--- /dev/null
+++ b/buildroot-external/package/python-ovos-phal-plugin-alsa/0001-Lower-pyalsaaudio-requirement.patch
@@ -0,0 +1,22 @@
+From ada27d7af14570cf1374ca5a4cbd47841c5c16a7 Mon Sep 17 00:00:00 2001
+From: j1nx
+Date: Thu, 29 Sep 2022 12:38:50 +0200
+Subject: [PATCH 1/1] Lower pyalsaaudio requirement
+
+---
+ requirements.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 49774e7..6bbfd60 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,3 +1,3 @@
+ ovos-plugin-manager~=0.0
+ json_database~=0.7
+-pyalsaaudio~=0.9
+\ No newline at end of file
++pyalsaaudio~=0.8
+--
+2.34.1
+
diff --git a/buildroot-external/package/python-ovos-phal-plugin-alsa/python-ovos-phal-plugin-alsa.mk b/buildroot-external/package/python-ovos-phal-plugin-alsa/python-ovos-phal-plugin-alsa.mk
index d94dbd8c..8657abaa 100644
--- a/buildroot-external/package/python-ovos-phal-plugin-alsa/python-ovos-phal-plugin-alsa.mk
+++ b/buildroot-external/package/python-ovos-phal-plugin-alsa/python-ovos-phal-plugin-alsa.mk
@@ -8,5 +8,6 @@ PYTHON_OVOS_PHAL_PLUGIN_ALSA_VERSION = 1b9fd98db53fd279bd48ffa86d985c4be9ca4329
PYTHON_OVOS_PHAL_PLUGIN_ALSA_SITE = $(call github,OpenVoiceOS,ovos-PHAL-plugin-alsa,$(PYTHON_OVOS_PHAL_PLUGIN_ALSA_VERSION))
PYTHON_OVOS_PHAL_PLUGIN_ALSA_SETUP_TYPE = setuptools
PYTHON_OVOS_PHAL_PLUGIN_ALSA_LICENSE_FILES = LICENSE
+PYTHON_OVOS_PHAL_PLUGIN_ALSA_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
$(eval $(python-package))
diff --git a/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
index 001a46c2..b4cd4d79 100644
--- a/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
+++ b/buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk
@@ -8,5 +8,6 @@ PYTHON_OVOS_SKILL_MANAGER_VERSION = 04102cc75c8777085a3304bb0a3023fb46891710
PYTHON_OVOS_SKILL_MANAGER_SITE = $(call github,OpenVoiceOS,ovos_skill_manager,$(PYTHON_OVOS_SKILL_MANAGER_VERSION))
PYTHON_OVOS_SKILL_MANAGER_SETUP_TYPE = setuptools
PYTHON_OVOS_SKILL_MANAGER_LICENSE_FILES = LICENSE
+YTHON_OVOS_SKILL_MANAGER_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
$(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 58e039e9..fdc6dfed 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 06a767a873c95a024f3b3ae07569f8c211f897bdbb60229bbde796d7343b885d python-ovos-utils-b7b787bb3dd5053aa72ed5b43bc926eaa483c33b.tar.gz
+sha256 7af457f7d3a55e6e2199621b2727e2bad8f264b22f6df47177dd75a4f4e590c1 python-ovos-utils-4e3443074c5538f6100cb938ec3b09d16ef8e269.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 39db7814..2417e58b 100644
--- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
+++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk
@@ -4,9 +4,10 @@
#
################################################################################
-PYTHON_OVOS_UTILS_VERSION = b7b787bb3dd5053aa72ed5b43bc926eaa483c33b
+PYTHON_OVOS_UTILS_VERSION = 4e3443074c5538f6100cb938ec3b09d16ef8e269
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
+PYTHON_OVOS_UTILS_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
$(eval $(python-package))
diff --git a/buildroot-external/package/skill-ovos-homescreen/0001-Loosen-arrow-requirement.patch b/buildroot-external/package/skill-ovos-homescreen/0001-Loosen-arrow-requirement.patch
new file mode 100644
index 00000000..1a72873c
--- /dev/null
+++ b/buildroot-external/package/skill-ovos-homescreen/0001-Loosen-arrow-requirement.patch
@@ -0,0 +1,25 @@
+From d54f697042e85d670db6f5c2d618b51682f9bd1a Mon Sep 17 00:00:00 2001
+From: j1nx
+Date: Thu, 29 Sep 2022 12:35:11 +0200
+Subject: [PATCH 1/1] Loosen arrow requirement
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 0ef1cd3..9d1116f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ setup(
+ package_data={'ovos_skill_homescreen': ["vocab/*", "ui/*", "skill/*, *.json"]},
+ packages=['ovos_skill_homescreen'],
+ include_package_data=True,
+- install_requires=["astral==1.4", "arrow==0.12.0"],
++ install_requires=["astral==1.4", "arrow>=0.12.0"],
+ keywords='ovos skill plugin',
+ entry_points={'ovos.plugin.skill': PLUGIN_ENTRY_POINT}
+ )
+--
+2.34.1
+
diff --git a/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.hash b/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.hash
index de93b085..8affdfce 100644
--- a/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.hash
+++ b/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.hash
@@ -1 +1 @@
-sha256 593ccd47520b209d36b9835983b320a33d41fee614cd74dd22af9f16a6235ffc skill-ovos-homescreen-e6cb87ca46d3f3b0b4125b0072e9c79a2634f2e6.tar.gz
+sha256 40754b23d745631e5d7e67feb23cf900d1b04a1e2d9a70eda54c56e316f9b185 skill-ovos-homescreen-475c0f70a5246f1ce23cbc7d5344f11d3040ed58.tar.gz
diff --git a/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.mk b/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.mk
index ca9a222d..26779ec3 100644
--- a/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.mk
+++ b/buildroot-external/package/skill-ovos-homescreen/skill-ovos-homescreen.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SKILL_OVOS_HOMESCREEN_VERSION = e6cb87ca46d3f3b0b4125b0072e9c79a2634f2e6
+SKILL_OVOS_HOMESCREEN_VERSION = 475c0f70a5246f1ce23cbc7d5344f11d3040ed58
SKILL_OVOS_HOMESCREEN_SITE = $(call github,OpenVoiceOS,skill-ovos-homescreen,$(SKILL_OVOS_HOMESCREEN_VERSION))
SKILL_OVOS_HOMESCREEN_SETUP_TYPE = setuptools
SKILL_OVOS_HOMESCREEN_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/skill-ovos-volume/0001-Loosen-pyalsaaudio-requirement.patch b/buildroot-external/package/skill-ovos-volume/0001-Loosen-pyalsaaudio-requirement.patch
new file mode 100644
index 00000000..702196a9
--- /dev/null
+++ b/buildroot-external/package/skill-ovos-volume/0001-Loosen-pyalsaaudio-requirement.patch
@@ -0,0 +1,36 @@
+From 92da74137b01f0133247c14d5c4336eb7a3d434e Mon Sep 17 00:00:00 2001
+From: j1nx
+Date: Thu, 29 Sep 2022 12:28:52 +0200
+Subject: [PATCH 1/1] Loosen pyalsaaudio requirement
+
+---
+ requirements.txt | 4 ++--
+ setup.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 16a2586..4a399ca 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,2 +1,2 @@
+-pyalsaaudio==0.8.2
+-ovos_utils
+\ No newline at end of file
++pyalsaaudio>=0.8.2
++ovos_utils
+diff --git a/setup.py b/setup.py
+index 2aa8f3c..f010fbc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ setup(
+ package_data={'ovos_skill_volume': ["locale/*"]},
+ packages=['ovos_skill_volume'],
+ include_package_data=True,
+- install_requires=["pyalsaaudio==0.8.2"],
++ install_requires=["pyalsaaudio>=0.8.2"],
+ keywords='ovos skill plugin',
+ entry_points={'ovos.plugin.skill': PLUGIN_ENTRY_POINT}
+ )
+--
+2.34.1
+