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

MycroftOS: Bump kernel + rpi-firmware + buildroot

This commit is contained in:
j1nx 2020-07-23 23:44:57 +02:00
parent a7c71a0b2b
commit 4fa9cf99d9
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot

@ -1 +1 @@
Subproject commit ab59bd24beddd43f8ac41d1c0bc4e8779844acaf
Subproject commit a5fdf37e134fa30afcf9ba6a8a3b9897b14355f7

2
buildroot-external/configs/rpi3_64-gui_defconfig
View File

@ -32,7 +32,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi3-64/post-image.s
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/5e5024f643caa53ff59a6e00f40a9b55f7fc4e17.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f0eeafb5d9109c2a1d512f045d7326a8a1d33e7e.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b"

2
buildroot-external/configs/rpi4_64-gui_defconfig
View File

@ -32,7 +32,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/5e5024f643caa53ff59a6e00f40a9b55f7fc4e17.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f0eeafb5d9109c2a1d512f045d7326a8a1d33e7e.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"

23
buildroot-patches/0012-Downgrade-python-urllib3-to-1.24.2.patch
View File

@ -1,6 +1,6 @@
From c0ae1185f51d3c19a896d0132975c8d54f67d5b3 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 09:53:51 +0100
From aeac8520080608825c7870af31b315b4130b137c Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 23 Jul 2020 23:41:44 +0200
Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2
---
@ -9,32 +9,31 @@ Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash
index 91b9e44622..d020e64a06 100644
index b1602350bd..87a16f573e 100644
--- a/package/python-urllib3/python-urllib3.hash
+++ b/package/python-urllib3/python-urllib3.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/urllib3/json
md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz
-sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz
@@ -1,4 +1,4 @@
# sha256 from https://pypi.org/pypi/urllib3/json
-sha256 3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 urllib3-1.25.9.tar.gz
+sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz
# Locally computed sha256 checksums
sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt
diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk
index 8383cbe8e8..893d32d976 100644
index b17a4c0cb6..893d32d976 100644
--- a/package/python-urllib3/python-urllib3.mk
+++ b/package/python-urllib3/python-urllib3.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_URLLIB3_VERSION = 1.25.6
-PYTHON_URLLIB3_VERSION = 1.25.9
+PYTHON_URLLIB3_VERSION = 1.24.2
PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/05/8c/40cd6949373e23081b3ea20d5594ae523e681b6f472e600fbc95ed046a36
+PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62
PYTHON_URLLIB3_LICENSE = MIT
PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
PYTHON_URLLIB3_SETUP_TYPE = setuptools
--
2.25.0
2.20.1

4
buildroot-patches/0106-Bump-RPI-Firmware-version.patch
View File

@ -15,7 +15,7 @@ index 59ab1da0c6..0506961472 100644
@@ -1,3 +1,3 @@
# Locally computed
-sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz
+sha256 e000cb9267fba7f5836a918436d8450fec0b22b3395cd206d7f1526c0649154c rpi-firmware-62fc8c01165a80021054a430182b504f7b877c2d.tar.gz
+sha256 x rpi-firmware-1c7b2e3db97daf92934c3d64b939d90a0eb8d880.tar.gz
sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 6fee60b08c..6053a12ba9 100644
@ -26,7 +26,7 @@ index 6fee60b08c..6053a12ba9 100644
################################################################################
-RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
+RPI_FIRMWARE_VERSION = 62fc8c01165a80021054a430182b504f7b877c2d
+RPI_FIRMWARE_VERSION = 1c7b2e3db97daf92934c3d64b939d90a0eb8d880
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom