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

MycroftOS: Buildroot: Adjust patchesfor Buildroot 2019.11.x

This commit is contained in:
Peter Steenbergen 2019-12-05 14:36:50 +01:00
parent 9bd1f0a872
commit 66eeec18d0
14 changed files with 70 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildroot-external/configs/mycroftos_rpi3_defconfig
View File

@ -261,7 +261,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_BASH_COMPLETION=y
BR2_PACKAGE_FILE=y BR2_PACKAGE_FILE=y
BR2_PACKAGE_SCREEN=y BR2_PACKAGE_SCREEN=y
@ -293,6 +293,8 @@ BR2_PACKAGE_HOST_PYTHON_CYTHON=y
BR2_PACKAGE_HOST_PYTHON_LXML=y BR2_PACKAGE_HOST_PYTHON_LXML=y
BR2_PACKAGE_HOST_PYTHON_SIX=y BR2_PACKAGE_HOST_PYTHON_SIX=y
BR2_PACKAGE_HOST_PYTHON_XLRD=y BR2_PACKAGE_HOST_PYTHON_XLRD=y
BR2_PACKAGE_HOST_PYTHON3=y
BR2_PACKAGE_HOST_PYTHON3_SSL=y
BR2_PACKAGE_FIRSTBOOT_SERVICE=y BR2_PACKAGE_FIRSTBOOT_SERVICE=y
BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y
BR2_PACKAGE_PYTHON_MYCROFT=y BR2_PACKAGE_PYTHON_MYCROFT=y

1
buildroot-external/package/python-gtts/python-gtts.mk
View File

@ -12,4 +12,3 @@ PYTHON_GTTS_LICENSE = MIT
PYTHON_GTTS_LICENSE_FILES = LICENSE PYTHON_GTTS_LICENSE_FILES = LICENSE
$(eval $(python-package)) $(eval $(python-package))
$(eval $(host-python-package))

28
buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch → buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch
View File

@ -1,7 +1,7 @@
From 2415c0b9d58a14000fe889400a560f037ba0aa28 Mon Sep 17 00:00:00 2001 From 701652ba2883b1032c26ba3e33c253f55d69a0e5 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl> From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 29 Oct 2018 14:13:00 +0100 Date: Tue, 3 Dec 2019 16:25:14 +0100
Subject: [PATCH 1/1] Update python-netifaces to 0.10.7 Subject: [PATCH 1/1] Downgrade python-netifaces to 0.10.7
--- ---
package/python-netifaces/python-netifaces.hash | 1 + package/python-netifaces/python-netifaces.hash | 1 +
@ -9,30 +9,32 @@ Subject: [PATCH 1/1] Update python-netifaces to 0.10.7
2 files changed, 3 insertions(+), 2 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-netifaces/python-netifaces.hash b/package/python-netifaces/python-netifaces.hash diff --git a/package/python-netifaces/python-netifaces.hash b/package/python-netifaces/python-netifaces.hash
index 335f907d59..9b07d58082 100644 index f59208014b..fde136fe62 100644
--- a/package/python-netifaces/python-netifaces.hash --- a/package/python-netifaces/python-netifaces.hash
+++ b/package/python-netifaces/python-netifaces.hash +++ b/package/python-netifaces/python-netifaces.hash
@@ -1,3 +1,4 @@ @@ -1,5 +1,6 @@
# md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed # md5, sha256 from https://pypi.org/pypi/netifaces/json
md5 1d424cb5ef52907c5ab913011122a98b netifaces-0.10.6.tar.gz md5 de92cc322b4f56047c073f802ad77860 netifaces-0.10.9.tar.gz
sha256 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 netifaces-0.10.6.tar.gz sha256 2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3 netifaces-0.10.9.tar.gz
+sha256 bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd netifaces-0.10.7.tar.gz +sha256 bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd netifaces-0.10.7.tar.gz
# Locally computed sha256 checksums
sha256 b20b895164b72b9cc0170e6c0d60b14f9aaacc6862c0556eed41eaa348883705 LICENSE
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index 3258be7a95..3a287d0b0d 100644 index 502529c008..101702e454 100644
--- a/package/python-netifaces/python-netifaces.mk --- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk +++ b/package/python-netifaces/python-netifaces.mk
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
-PYTHON_NETIFACES_VERSION = 0.10.6 -PYTHON_NETIFACES_VERSION = 0.10.9
+PYTHON_NETIFACES_VERSION = 0.10.7 +PYTHON_NETIFACES_VERSION = 0.10.7
PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
-PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/72/01/ba076082628901bca750bf53b322a8ff10c1d757dc29196a8e6082711c9d -PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/0d/18/fd6e9c71a35b67a73160ec80a49da63d1eed2d2055054cc2995714949132
+PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/81/39/4e9a026265ba944ddf1fea176dbb29e0fe50c43717ba4fcf3646d099fe38 +PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/81/39/4e9a026265ba944ddf1fea176dbb29e0fe50c43717ba4fcf3646d099fe38
PYTHON_NETIFACES_LICENSE = MIT PYTHON_NETIFACES_LICENSE = MIT
PYTHON_NETIFACES_LICENSE_FILES = README.rst PYTHON_NETIFACES_LICENSE_FILES = LICENSE
PYTHON_NETIFACES_SETUP_TYPE = setuptools PYTHON_NETIFACES_SETUP_TYPE = setuptools
-- --
2.11.0 2.24.0.rc1

36
buildroot-patches/0004-Upgrade-python-pillow-to-6.2.1.patch
View File

@ -1,36 +0,0 @@
From ea5047295ff6bce30ba65eb53f0e610c0600052d Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 15 Nov 2019 13:09:01 +0100
Subject: [PATCH 1/1] Upgrade python-pillow to 6.2.1
---
package/python-pillow/python-pillow.hash | 2 +-
package/python-pillow/python-pillow.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index fe72d01d38..4864d61ce7 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,4 +1,4 @@
# sha256 for python-pillow from https://pypi.org/project/Pillow/
# sha256 for LICENSE locally computed
-sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de Pillow-6.1.0.tar.gz
+sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 Pillow-6.2.1.tar.gz
sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index a4121da2b4..ae277dc2d2 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 6.1.0
+PYTHON_PILLOW_VERSION = 6.2.1
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/51/fe/18125dc680720e4c3086dd3f5f95d80057c41ab98326877fc7d3ff6d0ee5
PYTHON_PILLOW_LICENSE = PIL Software License
--
2.24.0.rc1

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

@ -1,6 +1,6 @@
From 8c2bf3b497d2aacd47d206103d269afb0b017168 Mon Sep 17 00:00:00 2001 From 098fca8b97aafe3c6d92d93c7abf6b9c931e292b Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl> From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 13:58:07 +0100 Date: Tue, 3 Dec 2019 16:31:35 +0100
Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1 Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
--- ---
@ -9,32 +9,32 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
2 files changed, 3 insertions(+), 2 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash
index e61bffa840..8626528a97 100644 index 3081e41540..5a6d45124a 100644
--- a/package/python-psutil/python-psutil.hash --- a/package/python-psutil/python-psutil.hash
+++ b/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/psutil/json # md5, sha256 from https://pypi.org/pypi/psutil/json
md5 1bbc1788588cc3c2c461cd98a830ba72 psutil-5.6.3.tar.gz md5 7ca9d297c23ca0074c1cf173bed061b0 psutil-5.6.4.tar.gz
sha256 863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3 psutil-5.6.3.tar.gz sha256 512e854d68f8b42f79b2c7864d997b39125baff9bcff00028ce43543867de7c4 psutil-5.6.4.tar.gz
+sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz +sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz
# Locally computed sha256 checksums # Locally computed sha256 checksums
sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index bb4d58930f..162d1b7f50 100644 index 0edf1c669b..162d1b7f50 100644
--- a/package/python-psutil/python-psutil.mk --- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
-PYTHON_PSUTIL_VERSION = 5.6.3 -PYTHON_PSUTIL_VERSION = 5.6.4
+PYTHON_PSUTIL_VERSION = 5.2.1 +PYTHON_PSUTIL_VERSION = 5.2.1
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/1c/ca/5b8c1fe032a458c2c4bcbe509d1401dca9dda35c7fc46b36bb81c2834740 -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/47/ea/d3b6d6fd0b4a6c12984df652525f394e68c8678d2b05075219144eb3a1cf
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240
PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_SETUP_TYPE = setuptools
PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE = BSD-3-Clause
PYTHON_PSUTIL_LICENSE_FILES = LICENSE PYTHON_PSUTIL_LICENSE_FILES = LICENSE
-- --
2.11.0 2.24.0.rc1

37
buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch
View File

@ -1,41 +1,40 @@
From cc13c52d8a7c8816b093688421b45dab0c620be6 Mon Sep 17 00:00:00 2001 From ef65c12a6bbcf4e6bf329d7b7e654f30414aac77 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl> From: Peter Steenbergen <info@j1nx.nl>
Date: Sat, 7 Sep 2019 17:03:17 +0200 Date: Tue, 3 Dec 2019 16:36:04 +0100
Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0 Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0
--- ---
package/python-websocket-client/python-websocket-client.hash | 1 + package/python-websocket-client/python-websocket-client.hash | 1 +
package/python-websocket-client/python-websocket-client.mk | 5 +++-- package/python-websocket-client/python-websocket-client.mk | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash
index 3672ca074b..70ea66a652 100644 index 735cb53e1c..a740da5245 100644
--- a/package/python-websocket-client/python-websocket-client.hash --- a/package/python-websocket-client/python-websocket-client.hash
+++ b/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash
@@ -2,3 +2,4 @@ @@ -1,5 +1,6 @@
md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz # md5, sha256 from https://pypi.org/pypi/websocket-client/json
sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz md5 89484bd5dac71123ae6a09b2f90fe62c websocket_client-0.56.0.tar.gz
sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE sha256 1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a websocket_client-0.56.0.tar.gz
+sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz +sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz
# Locally computed sha256 checksums
sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE
diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk
index 58c8407db3..e07f9c5a6a 100644 index 518f7b29a9..98cc941efe 100644
--- a/package/python-websocket-client/python-websocket-client.mk --- a/package/python-websocket-client/python-websocket-client.mk
+++ b/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk
@@ -4,11 +4,12 @@ @@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0 -PYTHON_WEBSOCKET_CLIENT_VERSION = 0.56.0
+PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0 +PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0
PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz
-PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27 -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/c5/01/8c9c7de6c46f88e70b5a3276c791a2be82ae83d8e0d0cc030525ee2866fd
+PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b
PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools
PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ # Project was under LGPL-2.1+, but was relicensed under
PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE # BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but
$(eval $(python-package))
+$(eval $(host-python-package))
-- --
2.11.0 2.24.0.rc1

35
buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch
View File

@ -1,35 +0,0 @@
From f1468008e466ce9aa27449c98ce775b292945190 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 7 Jan 2019 16:59:08 +0100
Subject: [PATCH 1/1] Add host-openssl dependency to python3
---
package/python3/python3.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 8fbb95b9ad..0f8cce45dc 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -26,8 +26,7 @@ HOST_PYTHON3_CONF_OPTS += \
--enable-unicodedata \
--disable-test-modules \
--disable-idle3 \
- --disable-ossaudiodev \
- --disable-openssl
+ --disable-ossaudiodev
# Make sure that LD_LIBRARY_PATH overrides -rpath.
# This is needed because libpython may be installed at the same time that
@@ -40,7 +39,7 @@ HOST_PYTHON3_CONF_ENV += \
PYTHON3_DEPENDENCIES = host-python3 libffi
-HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi
+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi host-openssl
PYTHON3_INSTALL_STAGING = YES
--
2.11.0

35
buildroot-patches/0018-Bump-RPI-Firmware-version-to-latest.patch
View File

@ -1,35 +0,0 @@
From 9e52511e6b9f427c99aef62b5f8d1f3de6f9528c Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 14:35:36 +0100
Subject: [PATCH 1/1] Bump RPI Firmware version to latest
---
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 61834f7d42..5f6f94d606 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 c82c40cf37fac36160a7f6b9c314506beb942bf113a55d30fa163c56a4f98946 rpi-firmware-bcf40b5c2b94178c7564fb451098d44968e44af5.tar.gz
+sha256 6e04cfca954c8e087eae81837a0813a642dcca58f05bcfdf6a15e69dc657a30e rpi-firmware-9f4983548584d4f70e6eec5270125de93a081483.tar.gz
sha256 ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 717f705f66..c9e7b35268 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_FIRMWARE_VERSION = bcf40b5c2b94178c7564fb451098d44968e44af5
+RPI_FIRMWARE_VERSION = 9f4983548584d4f70e6eec5270125de93a081483
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

38
buildroot-patches/0020-Upgrade-python-pyyaml-to-5.1.2.patch
View File

@ -1,38 +0,0 @@
From 625a432767c65656904369584b23f1f1bf901f76 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 24 Nov 2019 11:51:57 +0100
Subject: [PATCH 1/1] Upgrade python-pyyaml to 5.1.2
---
package/python-pyyaml/python-pyyaml.hash | 1 +
package/python-pyyaml/python-pyyaml.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash
index 256742feb6..7bdaca9859 100644
--- a/package/python-pyyaml/python-pyyaml.hash
+++ b/package/python-pyyaml/python-pyyaml.hash
@@ -1,3 +1,4 @@
# md5, sha256 from https://pypi.python.org/pypi/pyyaml/json
md5 a842bc7391e145bbe4e7fd0d32da1132 PyYAML-4.2b4.tar.gz
sha256 3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76 PyYAML-4.2b4.tar.gz
+sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
index b73b4356a0..165a938f11 100644
--- a/package/python-pyyaml/python-pyyaml.mk
+++ b/package/python-pyyaml/python-pyyaml.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYYAML_VERSION = 4.2b4
+PYTHON_PYYAML_VERSION = 5.1.2
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a8/c6/a8d1555e795dbd0375c3c93b576ca13bbf139db51ea604afa19a2c35fc03
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe
PYTHON_PYYAML_SETUP_TYPE = distutils
PYTHON_PYYAML_LICENSE = MIT
PYTHON_PYYAML_LICENSE_FILES = LICENSE
--
2.24.0.rc1

24
buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch
View File

@ -1,39 +1,39 @@
From d51497c842d0d84758cf400cf793173306202386 Mon Sep 17 00:00:00 2001 From 49c4b14af92d607156c16a5c0759a01cee0f7268 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl> From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 9 Sep 2019 15:58:14 +0200 Date: Tue, 3 Dec 2019 16:57:10 +0100
Subject: [PATCH 1/1] Downgrade python-dateutil to 2.7.5 Subject: [PATCH 1/1] Downgrade python-dateutil to 2.7.5
--- ---
package/python-dateutil/python-dateutil.hash | 2 +- package/python-dateutil/python-dateutil.hash | 1 +
package/python-dateutil/python-dateutil.mk | 4 ++-- package/python-dateutil/python-dateutil.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash
index eecba7d35a..4cee523d00 100644 index f3dc69f272..834d0b79b5 100644
--- a/package/python-dateutil/python-dateutil.hash --- a/package/python-dateutil/python-dateutil.hash
+++ b/package/python-dateutil/python-dateutil.hash +++ b/package/python-dateutil/python-dateutil.hash
@@ -1,5 +1,5 @@ @@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/python-dateutil/json # md5, sha256 from https://pypi.org/pypi/python-dateutil/json
md5 354db28843d949f1bc3e49e8458e22df python-dateutil-2.8.0.tar.gz md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz
-sha256 c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e python-dateutil-2.8.0.tar.gz sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz
+sha256 88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 python-dateutil-2.7.5.tar.gz +sha256 88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 python-dateutil-2.7.5.tar.gz
# Locally computed sha256 checksums # Locally computed sha256 checksums
sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE
diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk
index 4c915c8e83..5e90398331 100644 index 759261d2d1..5e90398331 100644
--- a/package/python-dateutil/python-dateutil.mk --- a/package/python-dateutil/python-dateutil.mk
+++ b/package/python-dateutil/python-dateutil.mk +++ b/package/python-dateutil/python-dateutil.mk
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
# #
################################################################################ ################################################################################
-PYTHON_DATEUTIL_VERSION = 2.8.0 -PYTHON_DATEUTIL_VERSION = 2.8.1
-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c -PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0
+PYTHON_DATEUTIL_VERSION = 2.7.5 +PYTHON_DATEUTIL_VERSION = 2.7.5
+PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0 +PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0
PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_SETUP_TYPE = setuptools
PYTHON_DATEUTIL_LICENSE = BSD-3-Clause PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
PYTHON_DATEUTIL_LICENSE_FILES = LICENSE PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
-- --
2.11.0 2.24.0.rc1

40
buildroot-patches/0022-Upgrade-python-tornado-to-6.0.3.patch
View File

@ -1,40 +0,0 @@
From 5f667546586532dddec1a93236be0acb58584535 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 24 Nov 2019 11:57:16 +0100
Subject: [PATCH 1/1] Upgrade python-tornado to 6.0.3
---
package/python-tornado/python-tornado.hash | 1 +
package/python-tornado/python-tornado.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash
index 18560b17ce..3158063ca8 100644
--- a/package/python-tornado/python-tornado.hash
+++ b/package/python-tornado/python-tornado.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/tornado/json
md5 63a26fdd0bf1154d4a5e9144b7028dd0 tornado-6.0.1.tar.gz
sha256 de274c65f45f6656c375cdf1759dbf0bc52902a1e999d12a35eb13020a641a53 tornado-6.0.1.tar.gz
+sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz
# Locally computed sha256 checksums
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk
index fe65d7516e..e326fadcb5 100644
--- a/package/python-tornado/python-tornado.mk
+++ b/package/python-tornado/python-tornado.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_TORNADO_VERSION = 6.0.1
+PYTHON_TORNADO_VERSION = 6.0.3
PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
-PYTHON_TORNADO_SITE = https://pypi.python.org/packages/b1/7f/8109821ff9df1bf3519169e34646705c32ac13be6a4d51a79ed57f47686e
+PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b
PYTHON_TORNADO_LICENSE = Apache-2.0
PYTHON_TORNADO_LICENSE_FILES = LICENSE
PYTHON_TORNADO_SETUP_TYPE = setuptools
--
2.24.0.rc1

35
buildroot-patches/0023-Bump-RPI-BT-Firmware-version-to-latest.patch
View File

@ -1,35 +0,0 @@
From b7c3b4b1cbc21c15affbf2d7199e1fe8ca4c6162 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 15:48:48 +0100
Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest
---
package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +-
package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash
index a3c7281d75..a9703150df 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk
index 23923453c4..785f007cc3 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
+RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION))
RPI_BT_FIRMWARE_LICENSE = PROPRIETARY
RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
--
2.11.0

35
buildroot-patches/0024-Bump-RPI-Wifi-Firmware-version-to-latest.patch
View File

@ -1,35 +0,0 @@
From d4e129660fede6331859dd3c955dbcdff851d8c9 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 15:53:01 +0100
Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest
---
package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
index 5de9e0f13f..c1f9494577 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
index 9dd1854b9a..6be02509fe 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
+RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
--
2.11.0

28
buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch
View File

@ -1,42 +1,40 @@
From 1d3d028e59a115f86fdac8b5bbd39dcc5565561c Mon Sep 17 00:00:00 2001 From 1710083a2e96bc5ab95f6cf4d16cd683902fee30 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl> From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 29 Oct 2019 19:33:27 +0100 Date: Tue, 3 Dec 2019 17:11:39 +0100
Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2 Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2
--- ---
package/python-urllib3/python-urllib3.hash | 6 +++--- package/python-urllib3/python-urllib3.hash | 1 +
package/python-urllib3/python-urllib3.mk | 4 ++-- package/python-urllib3/python-urllib3.mk | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash
index e61f754aa3..ec075cb4f6 100644 index 91b9e44622..0f01c43757 100644
--- a/package/python-urllib3/python-urllib3.hash --- a/package/python-urllib3/python-urllib3.hash
+++ b/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash
@@ -1,5 +1,5 @@ @@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/urllib3/json # md5, sha256 from https://pypi.org/pypi/urllib3/json
-md5 f09e95a5c42a7cc7ff7cb6a14c55fb69 urllib3-1.25.3.tar.gz md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz
-sha256 dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232 urllib3-1.25.3.tar.gz sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz
+md5 20bb5a170a534bd0acd98bfc007fcc22 urllib3-1.24.2.tar.gz
+sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz +sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz
# Locally computed sha256 checksums # Locally computed sha256 checksums
-sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt
+sha256 11db569430ca5ad793f1399297b8df5041a22137abaf90642ea71da21d59121c LICENSE.txt
diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk
index 5d8ec34f39..893d32d976 100644 index 8383cbe8e8..893d32d976 100644
--- a/package/python-urllib3/python-urllib3.mk --- a/package/python-urllib3/python-urllib3.mk
+++ b/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
-PYTHON_URLLIB3_VERSION = 1.25.3 -PYTHON_URLLIB3_VERSION = 1.25.6
+PYTHON_URLLIB3_VERSION = 1.24.2 +PYTHON_URLLIB3_VERSION = 1.24.2
PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/4c/13/2386233f7ee40aa8444b47f7463338f3cbdf00c316627558784e3f542f07 -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424
+PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62
PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE = MIT
PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
PYTHON_URLLIB3_SETUP_TYPE = setuptools PYTHON_URLLIB3_SETUP_TYPE = setuptools
-- --
2.11.0 2.24.0.rc1