[Buildroot] [git commit] {linux, linux-headers}: add version 5.15
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Wed Nov 3 21:12:36 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=73a55011419030bc1efedc8ef81e3f1a5ec33d3b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Michael Walle <michael at walle.cc>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
linux/Config.in | 4 ++--
linux/linux.hash | 1 +
package/linux-headers/Config.in.host | 13 +++++++++++--
toolchain/Config.in | 5 +++++
.../toolchain-external-custom/Config.in.options | 6 +++++-
5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 5ada29029b..d35dacc756 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -28,7 +28,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
- bool "Latest version (5.14)"
+ bool "Latest version (5.15)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (4.19.198-cip54)"
@@ -125,7 +125,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "5.14.14" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "5.15" if BR2_LINUX_KERNEL_LATEST_VERSION
default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
diff --git a/linux/linux.hash b/linux/linux.hash
index 200d328426..e58f25ae3c 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,4 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
+sha256 57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 linux-5.15.tar.xz
sha256 4dff4e96d4052195002538027f8a810411ba6116a41bff5575952702d509d06a linux-5.14.14.tar.xz
sha256 e877ec724e917c967603225c7e5dc21b6e0f34998c7d086cab8c50324363ab7b linux-5.13.19.tar.xz
sha256 0a2b2f5fefb90773190aaef4726ac363e03992aedc424b0a57eca092d084304b linux-5.10.75.tar.xz
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 95713a4a38..12d2caa20a 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
- default BR2_KERNEL_HEADERS_5_14
+ default BR2_KERNEL_HEADERS_5_15
help
Select the kernel version to get headers from.
@@ -65,6 +65,10 @@ config BR2_KERNEL_HEADERS_5_13
config BR2_KERNEL_HEADERS_5_14
bool "Linux 5.14.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
+
+config BR2_KERNEL_HEADERS_5_15
+ bool "Linux 5.15.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION
@@ -139,8 +143,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_5_15
+ bool "5.15.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14
- bool "5.14.x or later"
+ bool "5.14.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13
@@ -378,6 +386,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.10.75" if BR2_KERNEL_HEADERS_5_10
default "5.13.19" if BR2_KERNEL_HEADERS_5_13
default "5.14.14" if BR2_KERNEL_HEADERS_5_14
+ default "5.15" if BR2_KERNEL_HEADERS_5_15
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 0782fc6922..140d07ca38 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -568,6 +568,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@@ -581,6 +585,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
default "5.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index ae78c0ef9e..1cea64d105 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -123,8 +123,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_5_15
+ bool "5.15.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_14
- bool "5.14.x or later"
+ bool "5.14.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_13
More information about the buildroot
mailing list