Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
6 changes: 3 additions & 3 deletions linux/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ choice
prompt "Kernel version"

config BR2_LINUX_KERNEL_LATEST_VERSION
bool "Latest version (6.18)"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 if BR2_KERNEL_HEADERS_AS_KERNEL
bool "Latest version (6.19)"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19 if BR2_KERNEL_HEADERS_AS_KERNEL
# mips always generates an ITB image
select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
Expand Down Expand Up @@ -141,7 +141,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES

config BR2_LINUX_KERNEL_VERSION
string
default "6.18.9" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.19" 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
1 change: 1 addition & 0 deletions linux/from-6.17/linux.hash
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 303079a8250b8f381f82b03f90463d12ac98d4f6b149b761ea75af1323521357 linux-6.19.tar.xz
sha256 030115ff8fb4cb536d8449dc40ebc3e314e86ba1b316a6ae21091a11cc930578 linux-6.18.9.tar.xz

# Licenses hashes
Expand Down
1 change: 1 addition & 0 deletions package/linux-headers/6.19
13 changes: 11 additions & 2 deletions package/linux-headers/Config.in.host
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ comment "Kernel Header Options"
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_6_18
default BR2_KERNEL_HEADERS_6_19
help
Select the kernel version to get headers from.

Expand Down Expand Up @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_12
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_6_19
bool "Linux 6.19.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
select BR2_KERNEL_HEADERS_LATEST

config BR2_KERNEL_HEADERS_VERSION
Expand Down Expand Up @@ -129,8 +133,12 @@ choice
If your kernel headers are more recent than the latest version
in the choice, then select the latest version.

config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_19
bool "6.19.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19

config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18
bool "6.18.x or later"
bool "6.18.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18

config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_17
Expand Down Expand Up @@ -462,6 +470,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
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 "6.19" if BR2_KERNEL_HEADERS_6_19
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
5 changes: 5 additions & 0 deletions toolchain/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17

config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
select BR2_TOOLCHAIN_HEADERS_LATEST

# This should be selected by the latest version, above, to indicate that
Expand All @@ -685,6 +689,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
default "6.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
default "6.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
default "6.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
default "6.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,12 @@ choice
If your toolchain uses headers newer than the latest version
in the choice, then select the latest version.

config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_19
bool "6.19.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19

config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_18
bool "6.18.x or later"
bool "6.18.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18

config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_17
Expand Down