From 4061037d0bb69b9c23f4b154674b22482c813ddf Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Sat, 21 Dec 2019 23:43:56 +0100 Subject: [PATCH] MycroftOS: Some of tweaks and fises. --- buildroot-external/configs/rpi3_defconfig | 1 + .../etc/tmpfiles.d/mycroft.conf | 2 + .../0029-Downgrade-python-idna-to-2.7.patch | 40 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 buildroot-patches/0029-Downgrade-python-idna-to-2.7.patch diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index d6384f91..fddd12a9 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -178,6 +178,7 @@ BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_GOBJECT=y BR2_PACKAGE_PYTHON_INFLECTION=y +BR2_PACKAGE_PYTHON_IPADDRESS=y BR2_PACKAGE_PYTHON_LXML=y BR2_PACKAGE_PYTHON_NETADDR=y BR2_PACKAGE_PYTHON_OAUTHLIB=y diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf index 78f8b414..0f319dd6 100644 --- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf +++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf @@ -2,3 +2,5 @@ d /var/log/mycroft 700 mycroft mycroft d /opt/mycroft 755 mycroft mycroft d /opt/mycroft/skills 755 mycroft mycroft d /opt/mycroft/splash 755 mycroft mycroft +d /opt/mycroft/preloaded_cache 755 mycroft mycroft +d /opt/mycroft/preloaded_cache/Mimic2 755 mycroft mycroft diff --git a/buildroot-patches/0029-Downgrade-python-idna-to-2.7.patch b/buildroot-patches/0029-Downgrade-python-idna-to-2.7.patch new file mode 100644 index 00000000..fb5a7903 --- /dev/null +++ b/buildroot-patches/0029-Downgrade-python-idna-to-2.7.patch @@ -0,0 +1,40 @@ +From 1f1bad956ef4517ffddee70c748f9210ae23fc76 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sat, 21 Dec 2019 19:09:45 +0100 +Subject: [PATCH 1/1] Downgrade python-idna to 2.7 + +--- + package/python-idna/python-idna.hash | 2 +- + package/python-idna/python-idna.mk | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash +index ddfd44e97c..60ccbba654 100644 +--- a/package/python-idna/python-idna.hash ++++ b/package/python-idna/python-idna.hash +@@ -1,5 +1,5 @@ + # md5, sha256 from https://pypi.org/pypi/idna/json + md5 2e9ae0b4a0b26d1747c6127cdb060bc1 idna-2.8.tar.gz +-sha256 c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 idna-2.8.tar.gz ++sha256 684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16 idna-2.7.tar.gz + # Locally computed sha256 checksums + sha256 0d4bc7abd48dcfb14e24254ee404066737ff0167144e222914a2113b8794683e LICENSE.rst +diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk +index 1dae47bb2b..d5c57955a3 100644 +--- a/package/python-idna/python-idna.mk ++++ b/package/python-idna/python-idna.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_IDNA_VERSION = 2.8 ++PYTHON_IDNA_VERSION = 2.7 + PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz +-PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ad/13/eb56951b6f7950cadb579ca166e448ba77f9d24efc03edd7e55fa57d04b7 ++PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935 + PYTHON_IDNA_LICENSE = BSD-3-Clause + PYTHON_IDNA_LICENSE_FILES = LICENSE.rst + PYTHON_IDNA_SETUP_TYPE = setuptools +-- +2.24.0.rc1 +