Skip to content

[pull] master from buildroot:master #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Feb 7, 2026
Merged

[pull] master from buildroot:master #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4818609
{linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 6, 12, 18}.x series
bkuhls Feb 6, 2026
10033b6
package/libcamera: bump to v0.7.0
py06 Feb 6, 2026
67b7da7
{linux, linux-headers}: fix hash dir links
airtower-luna Feb 6, 2026
d892c5a
package/frr: bump version to 10.5.1
mattiaswal Feb 5, 2026
6b7b895
{boot/optee-os, package/optee-*}: bump version to 4.9.0
js214 Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boot/optee-os/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ choice
Select the version of OP-TEE OS you want to use

config BR2_TARGET_OPTEE_OS_LATEST
bool "4.6.0"
bool "4.9.0"
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
help
Expand Down Expand Up @@ -79,7 +79,7 @@ endif

config BR2_TARGET_OPTEE_OS_VERSION
string
default "4.6.0" if BR2_TARGET_OPTEE_OS_LATEST
default "4.9.0" if BR2_TARGET_OPTEE_OS_LATEST
default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL
Expand Down
2 changes: 1 addition & 1 deletion boot/optee-os/optee-os.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally computed
sha256 0c947c6972bf50c483cb993af01041d4094b1e03711c7246cdde6ba2ffc351fe optee-os-4.6.0.tar.gz
sha256 9400e16c45bfa45f15585b2c933b86c449e7de05def0ecaaa62a4f38973a3a45 optee-os-4.9.0.tar.gz
sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
0 linux/6.18.8 → linux/6.18.9
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion linux/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES

config BR2_LINUX_KERNEL_VERSION
string
default "6.18.8" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.18.9" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.246-cip66" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.246-cip66-rt29" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
Expand Down
10 changes: 5 additions & 5 deletions linux/before-6.17/linux.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 d367c7504bd4da520dd01eb08125d2d0ac088bc8af4cd56d236f2074dd4225b7 linux-6.12.68.tar.xz
sha256 d48e0d9de04bef2fb9740bdb0124548bcab8867cdca00ff9712c110282b299d6 linux-6.6.122.tar.xz
sha256 b41666bda7223600386a07ebe1802f5029da2fe81f6a85d691b6ec6a707e5a29 linux-6.1.161.tar.xz
sha256 4b493657f218703239c4f22415f027b3644949bf2761abd18b849f0aad5f7665 linux-6.12.69.tar.xz
sha256 a616d4b5a18a9097e2df8e03dfd2ba366ddfc1321b16d648651dc512b3e945b1 linux-6.6.123.tar.xz
sha256 9766422a49b9a24ea911ebc0b4e7d1f3d84fba3bc374387ae3c4bc60bec6d089 linux-6.1.162.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 5d4c0994580dd3bbd5ffc5fcb81c22dd305b844c9d8c7b176cc41b28f7e29743 linux-5.15.198.tar.xz
sha256 b5e6e4f1f904a3377dde32ef3bc322f03a78f045c4d666483d383153902de005 linux-5.10.248.tar.xz
sha256 01c0d3ae4c138a51891cb54d21374259fd07bfe1076e06362ec0ae0a822fbd2e linux-5.15.199.tar.xz
sha256 b990ed34261149542f932e5eaf1ba58535c5d48c147ae36bc2747c65e54d1046 linux-5.10.249.tar.xz
# Locally computed
sha256 93408e0c5d70ff0ab63dcf9edec6fda2b8524281d611a88e56590436bda43914 linux-cip-5.10.246-cip66.tar.gz
sha256 b3454708b98016f02604433e41060be2c1feb595c2bddeb25292596f047f0915 linux-cip-5.10.246-cip66-rt29.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion linux/from-6.17/linux.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 37f0c5d5c242c1d604e87d48f08795e861a5a85f725b4ca11d0a538f12ff8cff linux-6.18.8.tar.xz
sha256 030115ff8fb4cb536d8449dc40ebc3e314e86ba1b316a6ae21091a11cc930578 linux-6.18.9.tar.xz

# Licenses hashes
sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING
Expand Down
2 changes: 1 addition & 1 deletion package/frr/frr.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Locally calculated
sha256 a84b973e713349dca09e2009f33dc499564f2e9faba01c0d3cba9204802b0cd5 frr-10.5.0.tar.gz
sha256 fcdd1d326b2ebd1cc4b607fe1681d476865371ac0028fc5595a75c00f370189e frr-10.5.1.tar.gz
sha256 7bf053957d6c38e39a06a112c60ff35b228d3bd03edbe8c9a03508b051128d16 COPYING
sha256 f9e0c21faf738da586281c0beaad3cd56204c19085a10fe05e4d3d7f8b5863d2 doc/licenses/BSD-2-Clause
sha256 aca297b8fd3a43e3bb200f1e2e043c0db6c897325f5ff7f23f7530302a6bf713 doc/licenses/BSD-3-Clause
Expand Down
2 changes: 1 addition & 1 deletion package/frr/frr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

FRR_VERSION = 10.5.0
FRR_VERSION = 10.5.1
FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION))
FRR_LICENSE = GPL-2.0+
FRR_LICENSE_FILES = \
Expand Down
2 changes: 1 addition & 1 deletion package/libcamera/libcamera.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Locally computed
sha256 85d85409d6e04bcf2e1ed57d9b59ebcc9fb770e5d39690d7ac233e9784835b89 libcamera-v0.6.0-git4.tar.gz
sha256 9e684bfcb8679e5e7ec7fb0da9dec68e71f0b75a6b0c8edcd892b26a92726a92 libcamera-v0.7.0-git4.tar.gz

# license files
sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt
Expand Down
24 changes: 12 additions & 12 deletions package/libcamera/libcamera.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
################################################################################

LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git
LIBCAMERA_VERSION = v0.6.0
LIBCAMERA_VERSION = v0.7.0
LIBCAMERA_SITE_METHOD = git
LIBCAMERA_DEPENDENCIES = \
host-openssl \
Expand All @@ -23,23 +23,23 @@ LIBCAMERA_CONF_OPTS = \
-Dwerror=false
LIBCAMERA_INSTALL_STAGING = YES
LIBCAMERA_LICENSE = \
LGPL-2.1+ (library), \
GPL-2.0+ (utils), \
MIT (qcam/assets/feathericons), \
BSD-2-Clause (raspberrypi), \
GPL-2.0 with Linux-syscall-note or BSD-3-Clause (linux kernel headers), \
CC-BY-SA-4.0 (doc), \
CC0-1.0 (meson build system), \
CC-BY-SA-4.0 (doc)
GPL-2.0 with Linux-syscall-note or BSD-3-Clause (linux kernel headers), \
GPL-2.0+ (utils), \
LGPL-2.1+ (library), \
MIT (qcam/assets/feathericons)
LIBCAMERA_LICENSE_FILES = \
LICENSES/LGPL-2.1-or-later.txt \
LICENSES/GPL-2.0-or-later.txt \
LICENSES/MIT.txt \
LICENSES/BSD-2-Clause.txt \
LICENSES/GPL-2.0-only.txt \
LICENSES/Linux-syscall-note.txt \
LICENSES/BSD-3-Clause.txt \
LICENSES/CC-BY-SA-4.0.txt \
LICENSES/CC0-1.0.txt \
LICENSES/CC-BY-SA-4.0.txt
LICENSES/GPL-2.0-only.txt \
LICENSES/GPL-2.0-or-later.txt \
LICENSES/LGPL-2.1-or-later.txt \
LICENSES/Linux-syscall-note.txt \
LICENSES/MIT.txt

ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y)
LIBCAMERA_CXXFLAGS = -faligned-new
Expand Down
0 package/linux-headers/5.10.248 → package/linux-headers/5.10.249
View file
Open in desktop
File renamed without changes.
0 package/linux-headers/5.15.198 → package/linux-headers/5.15.199
View file
Open in desktop
File renamed without changes.
0 package/linux-headers/6.1.161 → package/linux-headers/6.1.162
View file
Open in desktop
File renamed without changes.
0 package/linux-headers/6.12.68 → package/linux-headers/6.12.69
View file
Open in desktop
File renamed without changes.
0 package/linux-headers/6.18.8 → package/linux-headers/6.18.9
View file
Open in desktop
File renamed without changes.
0 package/linux-headers/6.6.112 → package/linux-headers/6.6.123
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions package/linux-headers/Config.in.host
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,12 @@ endchoice

config BR2_DEFAULT_KERNEL_HEADERS
string
default "5.10.248" if BR2_KERNEL_HEADERS_5_10
default "5.15.198" if BR2_KERNEL_HEADERS_5_15
default "6.1.161" if BR2_KERNEL_HEADERS_6_1
default "6.6.122" if BR2_KERNEL_HEADERS_6_6
default "6.12.68" if BR2_KERNEL_HEADERS_6_12
default "6.18.8" if BR2_KERNEL_HEADERS_6_18
default "5.10.249" if BR2_KERNEL_HEADERS_5_10
default "5.15.199" if BR2_KERNEL_HEADERS_5_15
default "6.1.162" if BR2_KERNEL_HEADERS_6_1
default "6.6.123" if BR2_KERNEL_HEADERS_6_6
default "6.12.69" if BR2_KERNEL_HEADERS_6_12
default "6.18.9" if BR2_KERNEL_HEADERS_6_18
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
Expand Down
4 changes: 2 additions & 2 deletions package/optee-client/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ config BR2_PACKAGE_OPTEE_CLIENT_AS_OS
depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION

config BR2_PACKAGE_OPTEE_CLIENT_LATEST
bool "4.6.0"
bool "4.9.0"
help
Use the latest release tag from the optee-client official Git
repository.
Expand Down Expand Up @@ -60,7 +60,7 @@ config BR2_PACKAGE_OPTEE_CLIENT_VERSION
string
default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
if BR2_PACKAGE_OPTEE_CLIENT_AS_OS
default "4.6.0" if BR2_PACKAGE_OPTEE_CLIENT_LATEST
default "4.9.0" if BR2_PACKAGE_OPTEE_CLIENT_LATEST
default "custom" if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL

config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
Expand Down
2 changes: 1 addition & 1 deletion package/optee-client/optee-client.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally computed
sha256 a970338c9f69861901336716d89684646e4480b9970996a5b3581ae7d49fdaa3 optee-client-4.6.0.tar.gz
sha256 2ef152f25b682e59c3684d6d73d7c5a138495615f6b045e95266eb3d0bc0d04e optee-client-4.9.0.tar.gz
sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
4 changes: 2 additions & 2 deletions package/optee-examples/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS
depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION

config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
bool "4.6.0"
bool "4.9.0"
help
Use the latest release tag from the optee-examples official
Git repository.
Expand Down Expand Up @@ -72,7 +72,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION
string
default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
if BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS
default "4.6.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
default "4.9.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
default "custom" if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL

endif # BR2_PACKAGE_OPTEE_EXAMPLES
2 changes: 1 addition & 1 deletion package/optee-examples/optee-examples.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally computed
sha256 6891390aefa2046d500d3ffec05c327d7763e89645b2e99ef2330b561ba645f5 optee-examples-4.6.0.tar.gz
sha256 b95a3d72f2b266aedde0ed9b855f9c59cd0b2608df59b27e3f46935dfb6f919c optee-examples-4.9.0.tar.gz
sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE
4 changes: 2 additions & 2 deletions package/optee-test/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ config BR2_PACKAGE_OPTEE_TEST_AS_OS
depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION

config BR2_PACKAGE_OPTEE_TEST_LATEST
bool "4.6.0"
bool "4.9.0"
help
Use the latest release tag from the optee-test official Git
repository.
Expand Down Expand Up @@ -77,7 +77,7 @@ config BR2_PACKAGE_OPTEE_TEST_VERSION
string
default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
if BR2_PACKAGE_OPTEE_TEST_AS_OS
default "4.6.0" if BR2_PACKAGE_OPTEE_TEST_LATEST
default "4.9.0" if BR2_PACKAGE_OPTEE_TEST_LATEST
default "custom" if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL

endif # BR2_PACKAGE_OPTEE_TEST
2 changes: 1 addition & 1 deletion package/optee-test/optee-test.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Locally computed
sha256 db4de73fa955a7db70a64a2c4ad1d2c48ddcb54c369821aba670fec6131a6f61 optee-test-4.6.0.tar.gz
sha256 b7158740dc4ea2f585363097ebd60a265eef0e078674d70636b1731be94780cc optee-test-4.9.0.tar.gz
sha256 2b36458cd0292200e406a608efe7dfda17aae39646a86b730a2776b61d0fa410 LICENSE-BSD
sha256 a094472b51f57d0403953d087e410793519cb6f3a7cea2be34eb44e09a426a73 LICENSE-GPL
sha256 a562ab14c307d0e02b7bf6f1bdb0d1cf789409e6375a500e15dc7a0503e5c2c3 LICENSE.md