rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'upgrade/buildroot' into develop

This commit is contained in:
Peter Steenbergen 2019-09-03 14:48:07 +02:00
parent 469f4473bf 68bdd9ae75
commit 9a9c2f4703
13 changed files with 85 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "buildroot"]
path = buildroot
url = https://github.com/buildroot/buildroot.git
branch = 2018.11.x
branch = 2019.05.x

2
README.md
View File

@ -7,7 +7,7 @@ More information about the Mycroft A.I. software stack at https://mycroft.ai
## System.
- Linux kernel 4.14 (LT)
- Buildroot 2018.11.x
- Buildroot 2019.05.x
- Mycroft 18.08.x
- Raspberry Pi 3B (initial development hardware)

1
buildroot-external/Config.in
View File

@ -45,7 +45,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pychromecast/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyee/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pygithub/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyjwt/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pymplayer/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-requests-futures/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-rsa/Config.in"

2
buildroot-external/configs/mycroftos_rpi3_defconfig
View File

@ -111,6 +111,7 @@ BR2_PACKAGE_PYTHON_PIP=y
BR2_PACKAGE_PYTHON_PSUTIL=y
BR2_PACKAGE_PYTHON_PYCLI=y
BR2_PACKAGE_PYTHON_PYCRYPTO=y
BR2_PACKAGE_PYTHON_PYJWT=y
BR2_PACKAGE_PYTHON_PYTZ=y
BR2_PACKAGE_PYTHON_PYUSB=y
BR2_PACKAGE_PYTHON_SERIAL=y
@ -212,7 +213,6 @@ BR2_PACKAGE_PYTHON_POCKETSPHINX=y
BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y
BR2_PACKAGE_PYTHON_PULSECTL=y
BR2_PACKAGE_PYTHON_PYCHROMECAST=y
BR2_PACKAGE_PYTHON_PYJWT=y
BR2_PACKAGE_PYTHON_PYMPLAYER=y
BR2_PACKAGE_PYTHON_REQUESTS_FUTURES=y
BR2_PACKAGE_PYTHON_SGMLLIB3K=y

6
buildroot-external/package/python-pyjwt/Config.in
View File

@ -1,6 +0,0 @@
config BR2_PACKAGE_PYTHON_PYJWT
bool "python-pyjwt"
help
JSON Web Token implementation in Python.
http://github.com/jpadilla/pyjwt

5
buildroot-external/package/python-pyjwt/python-pyjwt.hash
View File

@ -1,5 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/pyjwt/json
md5 2731c6b66b67b95d1944f072f5fa35a9 PyJWT-1.6.4.tar.gz
sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz
# Locally computed sha256 checksums
sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE

14
buildroot-external/package/python-pyjwt/python-pyjwt.mk
View File

@ -1,14 +0,0 @@
################################################################################
#
# python-pyjwt
#
################################################################################
PYTHON_PYJWT_VERSION = 1.6.4
PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz
PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73
PYTHON_PYJWT_SETUP_TYPE = setuptools
PYTHON_PYJWT_LICENSE = MIT
PYTHON_PYJWT_LICENSE_FILES = LICENSE
$(eval $(python-package))

16
buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch
View File

@ -1,6 +1,6 @@
From 78f8690894cf7fe98b16a08a6f98cbb15b2c1fa3 Mon Sep 17 00:00:00 2001
From 8c455033a1d5a9010c8f09faaf4c53f1f7995e92 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 7 Jan 2019 14:12:49 +0100
Date: Mon, 2 Sep 2019 16:42:44 +0200
Subject: [PATCH 1/1] Downgrade python-pillow to 4.1.1
---
@ -9,26 +9,26 @@ Subject: [PATCH 1/1] Downgrade python-pillow to 4.1.1
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index 0f90a0be18..607b5d8b2b 100644
index fa9caae679..d74c79893e 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -2,3 +2,4 @@
# sha256 for LICENSE locally computed
sha256 f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab Pillow-5.2.0.tar.gz
sha256 4960fc18becc286be839c8ff17bd70cd5222533f761129142153443718a25199 LICENSE
sha256 809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5 Pillow-6.0.0.tar.gz
sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE
+sha256 00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 Pillow-4.1.1.tar.gz
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index c3a3d13315..227a664dde 100644
index 6efa9f3923..227a664dde 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 5.2.0
-PYTHON_PILLOW_VERSION = 6.0.0
+PYTHON_PILLOW_VERSION = 4.1.1
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/d3/c4/b45b9c0d549f482dd072055e2d3ced88f3b977f7b87c7a990228b20e7da1
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/81/1a/6b2971adc1bca55b9a53ed1efa372acff7e8b9913982a396f3fa046efaf8
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7
PYTHON_PILLOW_LICENSE = PIL Software License
PYTHON_PILLOW_LICENSE_FILES = LICENSE

16
buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch
View File

@ -1,6 +1,6 @@
From 66186ddaab483955112c35a527cf03eaeb13a42c Mon Sep 17 00:00:00 2001
From 604cd3de6db49b067154e0405ba605fa73b81443 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 7 Jan 2019 14:49:01 +0100
Date: Mon, 2 Sep 2019 16:54:02 +0200
Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
---
@ -9,28 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash
index 1f44281e29..0599aa8eb1 100644
index a7d49a9ab6..d8e1020fb1 100644
--- a/package/python-psutil/python-psutil.hash
+++ b/package/python-psutil/python-psutil.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/psutil/json
md5 0f08bf02400f81c28c4581619ca3e6cb psutil-5.4.8.tar.gz
sha256 6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3 psutil-5.4.8.tar.gz
md5 571962acd249bcfbae317884af47c402 psutil-5.6.2.tar.gz
sha256 828e1c3ca6756c54ac00f1427fdac8b12e21b8a068c3bb9b631a1734cada25ed psutil-5.6.2.tar.gz
+sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz
# Locally computed sha256 checksums
sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index 18567702bc..162d1b7f50 100644
index ed1a9051c8..162d1b7f50 100644
--- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PSUTIL_VERSION = 5.4.8
-PYTHON_PSUTIL_VERSION = 5.6.2
+PYTHON_PSUTIL_VERSION = 5.2.1
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e3/58/0eae6e4466e5abf779d7e2b71fac7fba5f59e00ea36ddb3ed690419ccb0f
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/c6/c1/beed5e4eaa1345901b595048fab1c85aee647ea0fc02d9e8bf9aceb81078
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240
PYTHON_PSUTIL_SETUP_TYPE = setuptools
PYTHON_PSUTIL_LICENSE = BSD-3-Clause

31
buildroot-patches/0009-Downgrade-python-six-to-1.10.0.patch
View File

@ -1,35 +1,40 @@
From a568b4834a1633fd204b31e9eb125f8e6bc66186 Mon Sep 17 00:00:00 2001
From e9f0baa5a6fda0e2928c9e763e15b5a199582290 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 29 Oct 2018 14:30:21 +0100
Date: Mon, 2 Sep 2019 17:15:01 +0200
Subject: [PATCH 1/1] Downgrade python-six to 1.10.0
---
package/python-six/python-six.hash | 1 +
package/python-six/python-six.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
package/python-six/python-six.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash
index f9dbf09eaa..4db18ac16e 100644
index b7262b12b1..45c3aecceb 100644
--- a/package/python-six/python-six.hash
+++ b/package/python-six/python-six.hash
@@ -2,3 +2,4 @@
md5 d12789f9baf7e9fb2524c0c64f1773f8 six-1.11.0.tar.gz
sha256 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 six-1.11.0.tar.gz
sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 LICENSE
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/six/json
md5 9ae5d1feed8c0215f4ae4adcd9207fcb six-1.12.0.tar.gz
sha256 d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 six-1.12.0.tar.gz
+sha256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a six-1.10.0.tar.gz
# Locally computed sha256 checksums
sha256 e732f54da58f3e9cf0c48e8b512948936fcf7361bd58afa63a9a3c392bf794ad LICENSE
diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk
index cd80634233..b9a5722949 100644
index 95817fa34b..b9a5722949 100644
--- a/package/python-six/python-six.mk
+++ b/package/python-six/python-six.mk
@@ -4,7 +4,7 @@
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_SIX_VERSION = 1.11.0
-PYTHON_SIX_VERSION = 1.12.0
+PYTHON_SIX_VERSION = 1.10.0
PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz
PYTHON_SIX_SITE = https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe
-PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca
+PYTHON_SIX_SITE = https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe
PYTHON_SIX_SETUP_TYPE = setuptools
PYTHON_SIX_LICENSE = MIT
PYTHON_SIX_LICENSE_FILES = LICENSE
--
2.11.0

35
buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch
View File

@ -1,35 +0,0 @@
From 5a4474b1d8d7d5f59d7de05a64360d46c39241cd Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 7 Jan 2019 17:11:18 +0100
Subject: [PATCH 1/1] Bump rpi-firmware to version:
e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7
---
package/rpi-firmware/rpi-firmware.hash | 2 +-
package/rpi-firmware/rpi-firmware.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index 728c53fe9a..85b760fa9b 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 57c56e9e41a2d9b1ce660aa7887db5c4b44f768fc63c6b6ef1d2fe460a090d85 rpi-firmware-fbad6408c4596d3d671736ee0571aae444f24e68.tar.gz
+sha256 58dc9d1080582964943b509ed9444602ce7fb50c1124199d3f06a5b121aa0706 rpi-firmware-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.tar.gz
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index bb54904ae6..70985880e9 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_FIRMWARE_VERSION = fbad6408c4596d3d671736ee0571aae444f24e68
+RPI_FIRMWARE_VERSION = e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
--
2.11.0

16
buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch
View File

@ -1,6 +1,6 @@
From eda2b1e6268b4410f62e220c7565528c75657d38 Mon Sep 17 00:00:00 2001
From a732a687373349bbb6e1640f5fa71420afb8e953 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 8 Jan 2019 14:42:40 +0100
Date: Mon, 2 Sep 2019 20:23:25 +0200
Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0
---
@ -9,28 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash
index e3b77744af..f7d20ab1a3 100644
index 46f62c75c5..297bb93110 100644
--- a/package/python-requests/python-requests.hash
+++ b/package/python-requests/python-requests.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/requests/json
md5 2918817ea4688f4ea21cb4b11e353448 requests-2.20.1.tar.gz
sha256 ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263 requests-2.20.1.tar.gz
md5 1bcd0e0977c3f8db1848ba0e2b7ab904 requests-2.21.0.tar.gz
sha256 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e requests-2.21.0.tar.gz
+sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz
# Locally computed sha256 checksums
sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE
diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk
index 0c327759b0..358835d816 100644
index 3d8542fcdf..358835d816 100644
--- a/package/python-requests/python-requests.mk
+++ b/package/python-requests/python-requests.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_REQUESTS_VERSION = 2.20.1
-PYTHON_REQUESTS_VERSION = 2.21.0
+PYTHON_REQUESTS_VERSION = 2.20.0
PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/40/35/298c36d839547b50822985a2cf0611b3b978a5ab7a5af5562b8ebe3e1369
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/52/2c/514e4ac25da2b08ca5a464c50463682126385c4272c18193876e91f4bc38
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c
PYTHON_REQUESTS_SETUP_TYPE = setuptools
PYTHON_REQUESTS_LICENSE = Apache-2.0

40
buildroot-patches/0017-Downgrade-python-pyjwt-to-1.6.4.patch Normal file
View File

@ -0,0 +1,40 @@
From 3bee492eb3f991b66401e4d47730e02dd59bca99 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 2 Sep 2019 20:37:58 +0200
Subject: [PATCH 1/1] Downgrade python-pyjwt to 1.6.4
---
package/python-pyjwt/python-pyjwt.hash | 1 +
package/python-pyjwt/python-pyjwt.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash
index 62ec3559af..0842d2d899 100644
--- a/package/python-pyjwt/python-pyjwt.hash
+++ b/package/python-pyjwt/python-pyjwt.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/PyJWT/json
md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz
sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz
+sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz
# Locally computed sha256 checksums
sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE
diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk
index dfc66e5651..18b7976b19 100644
--- a/package/python-pyjwt/python-pyjwt.mk
+++ b/package/python-pyjwt/python-pyjwt.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYJWT_VERSION = 1.7.1
+PYTHON_PYJWT_VERSION = 1.6.4
PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz
-PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c
+PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73
PYTHON_PYJWT_SETUP_TYPE = setuptools
PYTHON_PYJWT_LICENSE = MIT
PYTHON_PYJWT_LICENSE_FILES = LICENSE
--
2.11.0