mirror of
				https://github.com/OpenVoiceOS/OpenVoiceOS
				synced 2025-06-05 22:19:21 +02:00 
			
		
		
		
	Merge branch 'bug/wifi' into feature/wifi-setup
This commit is contained in:
		| @@ -6,8 +6,11 @@ BR2_CCACHE=y | ||||
| BR2_CCACHE_DIR="../ccache" | ||||
| BR2_GLOBAL_PATCH_DIR="../buildroot-patches" | ||||
| BR2_TOOLCHAIN_BUILDROOT_GLIBC=y | ||||
| BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y | ||||
| BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y | ||||
| BR2_BINUTILS_VERSION_2_32_X=y | ||||
| BR2_GCC_VERSION_8_X=y | ||||
| BR2_TOOLCHAIN_BUILDROOT_CXX=y | ||||
| BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y | ||||
| BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y | ||||
| BR2_TARGET_GENERIC_HOSTNAME="MycroftOS" | ||||
| BR2_TARGET_GENERIC_ISSUE="Welcome to MycroftOS" | ||||
| @@ -18,6 +21,7 @@ BR2_SYSTEM_BIN_SH_BASH=y | ||||
| BR2_SYSTEM_DHCP="eth0" | ||||
| # BR2_ENABLE_LOCALE_PURGE is not set | ||||
| BR2_GENERATE_LOCALE="en_US.UTF-8" | ||||
| BR2_SYSTEM_ENABLE_NLS=y | ||||
| BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL)/user_table.txt" | ||||
| BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/rootfs-overlay" | ||||
| BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi3/post-build.sh" | ||||
| @@ -26,11 +30,13 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" | ||||
| BR2_LINUX_KERNEL=y | ||||
| BR2_LINUX_KERNEL_CUSTOM_GIT=y | ||||
| BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" | ||||
| BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7688b39276ff9952df381d79de63b258e73971ce" | ||||
| BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="6018f7ebfe5e7fa01f499300b796f409a817241b" | ||||
| BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" | ||||
| BR2_LINUX_KERNEL_DTS_SUPPORT=y | ||||
| BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" | ||||
| BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y | ||||
| BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y | ||||
| BR2_PACKAGE_LINUX_TOOLS_GPIO=y | ||||
| BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/busybox.config" | ||||
| BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y | ||||
| BR2_PACKAGE_ALSA_UTILS=y | ||||
| @@ -81,10 +87,68 @@ BR2_PACKAGE_E2FSPROGS=y | ||||
| BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y | ||||
| BR2_PACKAGE_NTFS_3G=y | ||||
| BR2_PACKAGE_FBV=y | ||||
| BR2_PACKAGE_ARMBIAN_FIRMWARE=y | ||||
| BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y | ||||
| BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IBT=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y | ||||
| BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y | ||||
| BR2_PACKAGE_RPI_BT_FIRMWARE=y | ||||
| BR2_PACKAGE_RPI_FIRMWARE=y | ||||
| BR2_PACKAGE_RPI_FIRMWARE_X=y | ||||
| BR2_PACKAGE_RPI_WIFI_FIRMWARE=y | ||||
| BR2_PACKAGE_UX500_FIRMWARE=y | ||||
| BR2_PACKAGE_WILC1000_FIRMWARE=y | ||||
| BR2_PACKAGE_WILINK_BT_FIRMWARE=y | ||||
| BR2_PACKAGE_ZD1211_FIRMWARE=y | ||||
| BR2_PACKAGE_DBUS_PYTHON=y | ||||
| BR2_PACKAGE_KBD=y | ||||
| BR2_PACKAGE_PARTED=y | ||||
|   | ||||
| @@ -1,3 +1,4 @@ | ||||
| # Locally computed | ||||
| sha256	9f38d832acbfc7f07a58f15222d2fdcc0a9215ede488ccafb5c89a3e8223883d  respeaker-be0812c70be29b0666a89f22a9d403cfb4c48fca.tar.gz | ||||
| sha256	b68fb60cc173dc18e15bfc8eff97b57c3ef3085f2738c463ca9fa52d13d13896  respeaker-6c6b9ab7deb607aa985048ea170428729afc07a9.tar.gz | ||||
| sha256	981002329f1227334a166e0fec0f547831bca5e9d840ef096499cce8f063752c  respeaker-277aeacb81f4252767f234ae813ea535411f6138.tar.gz | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
| # | ||||
| ################################################################################ | ||||
|  | ||||
| RESPEAKER_VERSION = 6c6b9ab7deb607aa985048ea170428729afc07a9 | ||||
| RESPEAKER_VERSION = 277aeacb81f4252767f234ae813ea535411f6138 | ||||
| RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION)) | ||||
| RESPEAKER_LICENSE = GNU General Public License v3.0 | ||||
| RESPEAKER_DEPENDENCIES = rpi-firmware rpi-userland dtc | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| From 7ae402d49e37bb33d5868a1a207594dcd7da6ccd Mon Sep 17 00:00:00 2001 | ||||
| From 4ee090e789a75429c5eb91c6d8cb6c8dd8040cb8 Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Steenbergen <info@j1nx.nl> | ||||
| Date: Tue, 3 Sep 2019 20:44:43 +0200 | ||||
| Subject: [PATCH 1/1] Bump rpi-firmware to latest 4.14.x version | ||||
| Date: Tue, 22 Oct 2019 13:43:53 +0200 | ||||
| Subject: [PATCH 1/1] Bump RPI Firmware version to latest | ||||
| 
 | ||||
| ---
 | ||||
|  package/rpi-firmware/rpi-firmware.hash | 2 +- | ||||
| @@ -9,15 +9,15 @@ Subject: [PATCH 1/1] Bump rpi-firmware to latest 4.14.x version | ||||
|  2 files changed, 2 insertions(+), 2 deletions(-) | ||||
| 
 | ||||
| diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
 | ||||
| index d719fa6e08..b6b8824f3f 100644
 | ||||
| index d719fa6e08..5c39b0a0e3 100644
 | ||||
| --- a/package/rpi-firmware/rpi-firmware.hash
 | ||||
| +++ b/package/rpi-firmware/rpi-firmware.hash
 | ||||
| @@ -1,2 +1,2 @@
 | ||||
|  # Locally computed | ||||
| -sha256 e911f6342ea8aa9380cae97c6f5ac4ddd370527265f23d5b5d4b2c6f679d4ba8 rpi-firmware-ebf7b40cdc6effe7ffa3fd5195e8be01b94f80da.tar.gz
 | ||||
| +sha256 9a34ccc4a51695a33206cc6c8534f615ba5a30fcbce5fa3add400ecc6b80ad8a rpi-firmware-83977fe3b6ef54c1d29c83b0a778d330f523441f.tar.gz
 | ||||
| +sha256 6e04cfca954c8e087eae81837a0813a642dcca58f05bcfdf6a15e69dc657a30e rpi-firmware-9f4983548584d4f70e6eec5270125de93a081483.tar.gz
 | ||||
| diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 | ||||
| index 272db1c321..b57ed2ef4c 100644
 | ||||
| index 272db1c321..3089c8dbfc 100644
 | ||||
| --- a/package/rpi-firmware/rpi-firmware.mk
 | ||||
| +++ b/package/rpi-firmware/rpi-firmware.mk
 | ||||
| @@ -4,7 +4,7 @@
 | ||||
| @@ -25,7 +25,7 @@ index 272db1c321..b57ed2ef4c 100644 | ||||
|  ################################################################################ | ||||
|   | ||||
| -RPI_FIRMWARE_VERSION = ebf7b40cdc6effe7ffa3fd5195e8be01b94f80da
 | ||||
| +RPI_FIRMWARE_VERSION = 83977fe3b6ef54c1d29c83b0a778d330f523441f
 | ||||
| +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 | ||||
| @@ -0,0 +1,35 @@ | ||||
| From b6b2d68b6f7f78a37f7a05ac1bfa733a711a8ad5 Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Steenbergen <info@j1nx.nl> | ||||
| Date: Tue, 22 Oct 2019 13:36:33 +0200 | ||||
| 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 eeb7b605fe..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 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2  rpi-bt-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.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 f9f300da41..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 = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee | ||||
| +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 | ||||
|  | ||||
| @@ -0,0 +1,35 @@ | ||||
| From fab506fc779c6e5cde48b9e1e852a99fbb16fdf2 Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Steenbergen <info@j1nx.nl> | ||||
| Date: Tue, 22 Oct 2019 13:46:15 +0200 | ||||
| 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 c61a47ec73..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 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2  rpi-wifi-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.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 2eb8ceec3c..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 = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee | ||||
| +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 | ||||
|  | ||||
		Reference in New Issue
	
	Block a user