Skip to content

[pull] master from buildroot:master #1068

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 2 commits into from
Jun 28, 2026
Merged

[pull] master from buildroot:master #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5c88de
{linux, linux-headers}: bump 7.1.x, 7.0.x, 6.18.x series
bkuhls Jun 28, 2026
606f9ec
package/linux-headers: drop 7.0.x option
bkuhls Jun 28, 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
7 changes: 7 additions & 0 deletions Config.in.legacy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@ endif

comment "Legacy options removed in 2026.08"

config BR2_KERNEL_HEADERS_7_0
bool "kernel headers version 7.0.x are no longer supported"
select BR2_LEGACY
help
Version 7.0.x of the Linux kernel headers are no longer
maintained upstream and are now removed.

config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP
bool "bluez sap plugin removed"
select BR2_LEGACY
Expand Down
0 linux/7.1.1 → linux/7.1.2
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 @@ -143,7 +143,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES

config BR2_LINUX_KERNEL_VERSION
string
default "7.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION
default "7.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.254-cip72" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.254-cip72-rt32" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
Expand Down
5 changes: 2 additions & 3 deletions linux/from-6.17/linux.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# From https://www.kernel.org/pub/linux/kernel/v7.x/sha256sums.asc
sha256 5215fa3541dc7e7f5bcd51bf7e57f169cec6fce508ca54e3dc85fdee14371d7d linux-7.1.1.tar.xz
sha256 3c81edd0f716aca3dd48dff691681827580cc53d35a8eec3be47d346d1f89913 linux-7.0.13.tar.xz
sha256 37198c93727be247c9fb5309bb86cd5e496c61e5322cd8c4eca9476bb0b5883f linux-7.1.2.tar.xz

# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 fbab86c9f471c81075b280cca30bd85d790c060063a1245859b6344b07c9c44e linux-6.18.36.tar.xz
sha256 a83cd200e6646db52866b8309e9137b9e9048b613cbda10ced2b811aae125255 linux-6.18.37.tar.xz

# Licenses hashes
sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING
Expand Down
0 package/linux-headers/6.18.36 → package/linux-headers/6.18.37
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion package/linux-headers/7.1.1
View file
Open in desktop

This file was deleted.

0 package/linux-headers/7.0.13 → package/linux-headers/7.1.2
View file
Open in desktop
File renamed without changes.
9 changes: 2 additions & 7 deletions package/linux-headers/Config.in.host
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ config BR2_KERNEL_HEADERS_6_18
bool "Linux 6.18.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18

config BR2_KERNEL_HEADERS_7_0
bool "Linux 7.0.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0

config BR2_KERNEL_HEADERS_7_1
bool "Linux 7.1.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1
Expand Down Expand Up @@ -481,9 +477,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "6.1.176" if BR2_KERNEL_HEADERS_6_1
default "6.6.143" if BR2_KERNEL_HEADERS_6_6
default "6.12.94" if BR2_KERNEL_HEADERS_6_12
default "6.18.36" if BR2_KERNEL_HEADERS_6_18
default "7.0.13" if BR2_KERNEL_HEADERS_7_0
default "7.1.1" if BR2_KERNEL_HEADERS_7_1
default "6.18.37" if BR2_KERNEL_HEADERS_6_18
default "7.1.2" if BR2_KERNEL_HEADERS_7_1
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