mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

{toolchain, linux-headers}: add support for 6.1 headers

Browse Source 
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2022-12-18 12:21:57 +01:00
committed by Peter Korsgaard
parent 298bcb0455
commit 79bb1ab519
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
linux/linux.hash
View File

@@ -1,4 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz
sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz

13
package/linux-headers/Config.in.host
View File

@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice choice
prompt "Kernel Headers" prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_6_0 default BR2_KERNEL_HEADERS_6_1
help help
Select the kernel version to get headers from. Select the kernel version to get headers from.
@@ -56,6 +56,10 @@ config BR2_KERNEL_HEADERS_5_15
config BR2_KERNEL_HEADERS_6_0 config BR2_KERNEL_HEADERS_6_0
bool "Linux 6.0.x kernel headers" bool "Linux 6.0.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
config BR2_KERNEL_HEADERS_6_1
bool "Linux 6.1.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
select BR2_KERNEL_HEADERS_LATEST select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION config BR2_KERNEL_HEADERS_VERSION
@@ -133,8 +137,12 @@ choice
If your kernel headers are more recent than the latest version If your kernel headers are more recent than the latest version
in the choice, then select the latest version. in the choice, then select the latest version.
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1
bool "6.1.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0
bool "6.0.x or later" bool "6.0.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19
@@ -395,6 +403,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.10.159" if BR2_KERNEL_HEADERS_5_10 default "5.10.159" if BR2_KERNEL_HEADERS_5_10
default "5.15.83" if BR2_KERNEL_HEADERS_5_15 default "5.15.83" if BR2_KERNEL_HEADERS_5_15
default "6.0.13" if BR2_KERNEL_HEADERS_6_0 default "6.0.13" if BR2_KERNEL_HEADERS_6_0
default "6.1" if BR2_KERNEL_HEADERS_6_1
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \

5
toolchain/Config.in
View File

@@ -591,6 +591,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
bool bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
select BR2_TOOLCHAIN_HEADERS_LATEST select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that # This should be selected by the latest version, above, to indicate that
@@ -604,6 +608,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default. # stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string string
default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18

6
toolchain/toolchain-external/toolchain-external-custom/Config.in.options
View File

@@ -127,8 +127,12 @@ choice
If your toolchain uses headers newer than the latest version If your toolchain uses headers newer than the latest version
in the choice, then select the latest version. in the choice, then select the latest version.
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1
bool "6.1.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0
bool "6.0.x or later" bool "6.0.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19