| Message ID | 20240316084335.20839-1-bernd@kuhls.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/5] {toolchain, linux-headers}: add support for 6.7 headers | expand |
On 16/03/2024 09:43, Bernd Kuhls wrote: > And add (and default to) 6.7 to linux-headers. > > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Applied to master, thanks. Regards, Arnout > --- > linux/linux.hash | 1 + > package/linux-headers/Config.in.host | 13 +++++++++++-- > toolchain/Config.in | 5 +++++ > .../toolchain-external-custom/Config.in.options | 6 +++++- > 4 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/linux/linux.hash b/linux/linux.hash > index 977ad30f73..6b0c5de1f6 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -1,4 +1,5 @@ > # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc > +sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz > sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz > sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host > index fe4fc5011e..1c2500fb79 100644 > --- a/package/linux-headers/Config.in.host > +++ b/package/linux-headers/Config.in.host > @@ -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_6 > + default BR2_KERNEL_HEADERS_6_7 > help > Select the kernel version to get headers from. > > @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_1 > config BR2_KERNEL_HEADERS_6_6 > bool "Linux 6.6.x kernel headers" > select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 > + > +config BR2_KERNEL_HEADERS_6_7 > + bool "Linux 6.7.x kernel headers" > + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 > select BR2_KERNEL_HEADERS_LATEST > > config BR2_KERNEL_HEADERS_VERSION > @@ -124,8 +128,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_7 > + bool "6.7.x or later" > + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 > + > config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 > - bool "6.6.x or later" > + bool "6.6.x" > select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 > > config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 > @@ -409,6 +417,7 @@ config BR2_DEFAULT_KERNEL_HEADERS > default "5.15.151" if BR2_KERNEL_HEADERS_5_15 > default "6.1.81" if BR2_KERNEL_HEADERS_6_1 > default "6.6.21" if BR2_KERNEL_HEADERS_6_6 > + default "6.7.10" if BR2_KERNEL_HEADERS_6_7 > 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 \ > diff --git a/toolchain/Config.in b/toolchain/Config.in > index 1641dbae06..d71fb96d40 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 > config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 > bool > select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 > + > +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 > + bool > + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 > select BR2_TOOLCHAIN_HEADERS_LATEST > > # This should be selected by the latest version, above, to indicate that > @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST > # stops affecting a value on the first matching default. > config BR2_TOOLCHAIN_HEADERS_AT_LEAST > string > + default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 > default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 > default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 > default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 > diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options > index 5554d56719..a7c239dcab 100644 > --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options > +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options > @@ -162,8 +162,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_7 > + bool "6.7.x or later" > + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 > + > config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 > - bool "6.6.x or later" > + bool "6.6.x" > select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 > > config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5
diff --git a/linux/linux.hash b/linux/linux.hash index 977ad30f73..6b0c5de1f6 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fe4fc5011e..1c2500fb79 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -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_6 + default BR2_KERNEL_HEADERS_6_7 help Select the kernel version to get headers from. @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 + +config BR2_KERNEL_HEADERS_6_7 + bool "Linux 6.7.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -124,8 +128,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_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 @@ -409,6 +417,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.151" if BR2_KERNEL_HEADERS_5_15 default "6.1.81" if BR2_KERNEL_HEADERS_6_1 default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "6.7.10" if BR2_KERNEL_HEADERS_6_7 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 1641dbae06..d71fb96d40 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 5554d56719..a7c239dcab 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,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_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5
And add (and default to) 6.7 to linux-headers. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-)