| Message ID | 20240414141653.1376138-1-bernd@kuhls.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/linux-headers: drop 6.7.x option | expand |
On 14/04/2024 16:16, Bernd Kuhls wrote: > The 6.7.x series is now EOL upstream, so drop the linux-headers option > and add legacy handling for it. > > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Applied both to master, thanks. Regards, Arnout > --- > Config.in.legacy | 7 +++++++ > linux/linux.hash | 1 - > package/linux-headers/Config.in.host | 5 ----- > 3 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 76af1da348..98a4125f4b 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2024.05" > > +config BR2_KERNEL_HEADERS_6_7 > + bool "kernel headers version 6.7.x are no longer supported" > + select BR2_LEGACY > + help > + Version 6.7.x of the Linux kernel headers are no longer > + maintained upstream and are now removed. > + > config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen removed" > select BR2_LEGACY > diff --git a/linux/linux.hash b/linux/linux.hash > index 4fa9f701cd..d66bb54b5e 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -1,6 +1,5 @@ > # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc > sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz > -sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz > sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz > sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.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 4c3651450e..78ba644c95 100644 > --- a/package/linux-headers/Config.in.host > +++ b/package/linux-headers/Config.in.host > @@ -48,10 +48,6 @@ 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 > - > config BR2_KERNEL_HEADERS_6_8 > bool "Linux 6.8.x kernel headers" > select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 > @@ -425,7 +421,6 @@ config BR2_DEFAULT_KERNEL_HEADERS > default "5.15.152" if BR2_KERNEL_HEADERS_5_15 > default "6.1.82" if BR2_KERNEL_HEADERS_6_1 > default "6.6.22" if BR2_KERNEL_HEADERS_6_6 > - default "6.7.10" if BR2_KERNEL_HEADERS_6_7 > default "6.8.1" if BR2_KERNEL_HEADERS_6_8 > default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION > default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
diff --git a/Config.in.legacy b/Config.in.legacy index 76af1da348..98a4125f4b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_KERNEL_HEADERS_6_7 + bool "kernel headers version 6.7.x are no longer supported" + select BR2_LEGACY + help + Version 6.7.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_TARGET_TI_K3_IMAGE_GEN bool "ti-k3-image-gen removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 4fa9f701cd..d66bb54b5e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz -sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.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 4c3651450e..78ba644c95 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -48,10 +48,6 @@ 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 - config BR2_KERNEL_HEADERS_6_8 bool "Linux 6.8.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 @@ -425,7 +421,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.152" if BR2_KERNEL_HEADERS_5_15 default "6.1.82" if BR2_KERNEL_HEADERS_6_1 default "6.6.22" if BR2_KERNEL_HEADERS_6_6 - default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default "6.8.1" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
The 6.7.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-)