rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-02-02 19:57:19 +01:00
Code Issues Releases Wiki Activity

Bump buildroot once again in prep for next LTS version.

Browse Source
This commit is contained in:
j1nx 2024-11-18 14:16:03 +00:00
parent 3fc2f022b5
commit 8901830028
21 changed files with 9 additions and 192 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/OpenVoiceOS/buildroot.git
branch = ovos-2024.02.x
branch = ovos-2025.02.x

2
buildroot

@ -1 +1 @@
Subproject commit 383b8a6c8578f184f88d5c67681980c10e9fca02
Subproject commit 889d135ea26318212092ad55bd88d1d0ba9cfb1e

5
buildroot-external/Config.in
View File

@ -147,7 +147,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-adapt-parser/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-astral/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-audio-metadata/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-autocommand/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-bitstruct/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-board/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-bs4/Config.in"
@ -184,10 +183,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-hijri-converter/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-holidays/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-importlib-metadata/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-inflect/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-jaraco-collections/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-jaraco-context/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-jaraco-text/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-joblib/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-json-database/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-kthread/Config.in"

2
buildroot-external/board/ovos/raspberrypi/patches/linux/0001-Add-support-for-the-XMOS-VocalFusion-3510-INT-soundc.patch
View File

@ -235,7 +235,7 @@ index c8f681cb07ca..17bd6cfc0e01 100644
+
+static int xmos_xvf3510_init(struct snd_soc_pcm_runtime *rtd)
+{
+ struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+ struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+ struct gpio_desc *pwr_gpio, *rst_gpio;
+ struct clk *mclk;
+ int rate, ret;

13
buildroot-external/configs/rpi4_64_defconfig
View File

@ -31,7 +31,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/scripts/post-image.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL)/board/ovos/raspberrypi/rpi4"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,1af976d476424009ac9d93313a9fad9cbb5498ae)/linux-1af976d476424009ac9d93313a9fad9cbb5498ae.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,2ac3d763e26c01e287b77353e2158594e0910778)/linux-2ac3d763e26c01e287b77353e2158594e0910778.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/kernel/ovos.config $(BR2_EXTERNAL)/kernel/device-drivers.config $(BR2_EXTERNAL)/kernel/docker.config $(BR2_EXTERNAL)/board/ovos/raspberrypi/kernel.config"
BR2_LINUX_KERNEL_LZ4=y
@ -63,7 +63,6 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_FFMPEG_GPL=y
BR2_PACKAGE_FFMPEG_NONFREE=y
BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
# BR2_PACKAGE_GSTREAMER1_PARSE is not set
# BR2_PACKAGE_GSTREAMER1_TRACE is not set
# BR2_PACKAGE_GSTREAMER1_GST_DEBUG is not set
@ -90,6 +89,7 @@ BR2_PACKAGE_NMON=y
BR2_PACKAGE_BINUTILS=y
BR2_PACKAGE_DIFFUTILS=y
BR2_PACKAGE_FINDUTILS=y
BR2_PACKAGE_FLEX=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_GREP=y
BR2_PACKAGE_JO=y
@ -163,6 +163,8 @@ BR2_PACKAGE_LOCKDEV=y
BR2_PACKAGE_PHYSFS=y
BR2_PACKAGE_JPEG=y
BR2_PACKAGE_LIBPNG=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
BR2_PACKAGE_JITTERENTROPY_LIBRARY=y
BR2_PACKAGE_LIBAIO=y
BR2_PACKAGE_LIBGPIOD2=y
@ -308,6 +310,8 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_E2FSPROGS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_GO=y
BR2_PACKAGE_HOST_GO_BIN=y
BR2_PACKAGE_HOST_MKPASSWD=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_PKGCONF=y
@ -316,16 +320,11 @@ BR2_PACKAGE_BTSPEAKER=y
BR2_PACKAGE_KSM_PRELOAD=y
BR2_PACKAGE_KSMTUNED=y
BR2_PACKAGE_NCPAMIXER=y
BR2_PACKAGE_OVOS_CONTAINERS=y
BR2_PACKAGE_OVOS_CONTAINERS_ARCH="arm64"
BR2_PACKAGE_OVOS_CONTAINERS_GUI=y
BR2_PACKAGE_OVOS_RUST_MESSAGEBUS=y
BR2_PACKAGE_OVOS_SPLASH=y
BR2_PACKAGE_RESPEAKER=y
BR2_PACKAGE_RNNNOISE_LADSPA=y
BR2_PACKAGE_RPI_BLUETOOTH=y
BR2_PACKAGE_RPI_EEPROM=y
BR2_PACKAGE_USERLAND_TOOLS=y
BR2_PACKAGE_VOCALFUSION=y
BR2_PACKAGE_PYTHON_ADAFRUIT_BLINKA=y
BR2_PACKAGE_PYTHON_SMBUS2=y

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

@ -1,6 +0,0 @@
config BR2_PACKAGE_PYTHON_AUTOCOMMAND
bool "python-autocommand"
help
A library to create a command-line program from a function.
https://github.com/Lucretiel/autocommand

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

@ -1,5 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/autocommand/json
md5 0cab5141bad0dfb363b086e93fd4125e autocommand-2.2.2.tar.gz
sha256 878de9423c5596491167225c2a455043c3130fb5b7286ac83443d45e74955f34 autocommand-2.2.2.tar.gz
# Locally computed sha256 checksums
sha256 ade78d04982d69972d444a8e14a94f87a2334dd3855cc80348ea8e240aa0df2d LICENSE

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

@ -1,14 +0,0 @@
################################################################################
#
# python-autocommand
#
################################################################################
PYTHON_AUTOCOMMAND_VERSION = 2.2.2
PYTHON_AUTOCOMMAND_SOURCE = autocommand-$(PYTHON_AUTOCOMMAND_VERSION).tar.gz
PYTHON_AUTOCOMMAND_SITE = https://files.pythonhosted.org/packages/5b/18/774bddb96bc0dc0a2b8ac2d2a0e686639744378883da0fc3b96a54192d7a
PYTHON_AUTOCOMMAND_SETUP_TYPE = setuptools
PYTHON_AUTOCOMMAND_LICENSE = GNU Lesser General Public License v3 (LGPLv3)
PYTHON_AUTOCOMMAND_LICENSE_FILES = LICENSE
$(eval $(python-package))

7
buildroot-external/package/python-inflect/Config.in
View File

@ -1,7 +0,0 @@
config BR2_PACKAGE_PYTHON_INFLECT
bool "python-inflect"
help
Correctly generate plurals, ordinals,
indefinite articles; convert numbers to words
https://github.com/jaraco/inflect

2
buildroot-external/package/python-inflect/python-inflect.hash
View File

@ -1,2 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/pyxdg/json
sha256 41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73 inflect-5.3.0.tar.gz

12
buildroot-external/package/python-inflect/python-inflect.mk
View File

@ -1,12 +0,0 @@
################################################################################
#
# python-inflect
#
################################################################################
PYTHON_INFLECT_VERSION = 5.3.0
PYTHON_INFLECT_SOURCE = inflect-$(PYTHON_INFLECT_VERSION).tar.gz
PYTHON_INFLECT_SITE = https://files.pythonhosted.org/packages/a8/da/0d51c307544f4cde8d5aeadc2ff6b4d51f8fcd768467f62013b16a8002b5
PYTHON_INFLECT_SETUP_TYPE = setuptools
$(eval $(python-package))

7
buildroot-external/package/python-jaraco-collections/Config.in
View File

@ -1,7 +0,0 @@
config BR2_PACKAGE_PYTHON_JARACO_COLLECTIONS
bool "python-jaraco-collections"
help
Models and classes to supplement the stdlib
‘collections’ module.
https://github.com/jaraco/jaraco.collections

2
buildroot-external/package/python-jaraco-collections/python-jaraco-collections.hash
View File

@ -1,2 +0,0 @@
# sha256 from https://pypi.org/pypi/jaraco.collections/json
sha256 4f5a36aa6aa196dc13a9d0575aa442e9fedab664b9b12e83810f2333ef6c3e57 jaraco.collections-4.1.0.tar.gz

15
buildroot-external/package/python-jaraco-collections/python-jaraco-collections.mk
View File

@ -1,15 +0,0 @@
################################################################################
#
# python-jaraco-collections
#
################################################################################
PYTHON_JARACO_COLLECTIONS_VERSION = 4.1.0
PYTHON_JARACO_COLLECTIONS_SOURCE = jaraco.collections-$(PYTHON_JARACO_COLLECTIONS_VERSION).tar.gz
PYTHON_JARACO_COLLECTIONS_SITE = https://files.pythonhosted.org/packages/39/5f/3d235b6c12b117c7bc0d96a2bc6ab6bdac00567f8e595729a0cfe14994a7
PYTHON_JARACO_COLLECTIONS_LICENSE = MIT
PYTHON_JARACO_COLLECTIONS_LICENSE_FILES = LICENSE
PYTHON_JARACO_COLLECTIONS_SETUP_TYPE = setuptools
PYTHON_JARACO_COLLECTIONS_DEPENDENCIES = host-python-setuptools-scm
$(eval $(python-package))

11
buildroot-external/package/python-jaraco-context/Config.in
View File

@ -1,11 +0,0 @@
config BR2_PACKAGE_PYTHON_JARACO_CONTEXT
bool "python-jaraco-context"
help
Available as part of the Tidelift Subscription.
This project and the maintainers of thousands of
other packages are working with Tidelift to deliver
one enterprise subscription that covers all of the
open source you use.
https://github.com/jaraco/jaraco.context

2
buildroot-external/package/python-jaraco-context/python-jaraco-context.hash
View File

@ -1,2 +0,0 @@
# sha256 from https://pypi.org/pypi/jaraco.context/json
sha256 4dad2404540b936a20acedec53355bdaea223acb88fd329fa6de9261c941566e jaraco.context-4.3.0.tar.gz

15
buildroot-external/package/python-jaraco-context/python-jaraco-context.mk
View File

@ -1,15 +0,0 @@
################################################################################
#
# python-jaraco-context
#
################################################################################
PYTHON_JARACO_CONTEXT_VERSION = 4.3.0
PYTHON_JARACO_CONTEXT_SOURCE = jaraco.context-$(PYTHON_JARACO_CONTEXT_VERSION).tar.gz
PYTHON_JARACO_CONTEXT_SITE = https://files.pythonhosted.org/packages/7c/b4/fa71f82b83ebeed95fe45ce587d6cba85b7c09ef3d9f61602f92f45e90db
PYTHON_JARACO_CONTEXT_LICENSE = MIT
PYTHON_JARACO_CONTEXT_LICENSE_FILES = LICENSE
PYTHON_JARACO_CONTEXT_SETUP_TYPE = setuptools
PYTHON_JARACO_CONTEXT_DEPENDENCIES = host-python-setuptools-scm
$(eval $(python-package))

10
buildroot-external/package/python-jaraco-text/Config.in
View File

@ -1,10 +0,0 @@
config BR2_PACKAGE_PYTHON_JARACO_TEXT
bool "python-jaraco-text"
help
This package provides handy routines for dealing
with text, such as wrapping, substitution, trimming,
stripping, prefix and suffix removal, line continuation,
indentation, comment processing, identifier processing,
values parsing, case insensitive comparison, and more.
https://github.com/jaraco/jaraco.text

2
buildroot-external/package/python-jaraco-text/python-jaraco-text.hash
View File

@ -1,2 +0,0 @@
# sha256 from https://pypi.org/pypi/jaraco.text/json
sha256 333a5df2148f7139718607cdf352fe1d95162971a7299c380dcc24dab0168980 jaraco.text-3.11.1.tar.gz

15
buildroot-external/package/python-jaraco-text/python-jaraco-text.mk
View File

@ -1,15 +0,0 @@
################################################################################
#
# python-jaraco-text
#
################################################################################
PYTHON_JARACO_TEXT_VERSION = 3.11.1
PYTHON_JARACO_TEXT_SOURCE = jaraco.text-$(PYTHON_JARACO_TEXT_VERSION).tar.gz
PYTHON_JARACO_TEXT_SITE = https://files.pythonhosted.org/packages/cd/32/2d0656905672c06c830dd1c85d11c5edbd5203f7ef6522f7c080a95c3470
PYTHON_JARACO_TEXT_LICENSE = MIT
PYTHON_JARACO_TEXT_LICENSE_FILES = LICENSE
PYTHON_JARACO_TEXT_SETUP_TYPE = setuptools
PYTHON_JARACO_TEXT_DEPENDENCIES = host-python-setuptools-scm
$(eval $(python-package))

52
buildroot-external/patches/linux/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch
View File

@ -1,52 +0,0 @@
From 76591e4075194cf717dc085b8285912f706bcd46 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 28 Mar 2023 12:02:10 +0200
Subject: [PATCH] ipv6: add option to explicitly enable reachability test
Systems which act as host as well as router might prefer the host
behavior. Currently the kernel does not allow to use IPv6 forwarding
globally and at the same time use route reachability probing.
Add a compile time flag to enable route reachability probe in any
case.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
net/ipv6/Kconfig | 9 +++++++++
net/ipv6/route.c | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 08d4b7132d4c..242bf2eeb7ae 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD
If unsure, say N.
+config IPV6_REACHABILITY_PROBE
+ bool "IPv6: Always use reachability probing (RFC 4191)"
+ help
+ By default reachability probing is disabled on router devices (when
+ IPv6 forwarding is enabled). This option explicitly enables
+ reachability probing always.
+
+ If unsure, say N.
+
config INET6_AH
tristate "IPv6: AH transformation"
select XFRM_AH
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 56525b5b95a2..916769b9a772 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2211,7 +2211,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
strict |= flags & RT6_LOOKUP_F_IFACE;
strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE;
- if (net->ipv6.devconf_all->forwarding == 0)
+ if (net->ipv6.devconf_all->forwarding == 0 ||
+ IS_ENABLED(CONFIG_IPV6_REACHABILITY_PROBE))
strict |= RT6_LOOKUP_F_REACHABLE;
rcu_read_lock();