mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 13:16:35 +00:00
{linux, linux-headers}: bump to version 5.2
Signed-off-by: Serhii Sakhno <sergei.sakhno@gmail.com> [Peter: default to 5.2.x kernel headers] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
c072ec18c0
commit
48491aa0a4
@ -32,7 +32,7 @@ choice
|
|||||||
prompt "Kernel version"
|
prompt "Kernel version"
|
||||||
|
|
||||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||||
bool "Latest version (5.1)"
|
bool "Latest version (5.2)"
|
||||||
|
|
||||||
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||||
bool "Latest CIP SLTS version (v4.19.13-cip1)"
|
bool "Latest CIP SLTS version (v4.19.13-cip1)"
|
||||||
@ -122,7 +122,7 @@ endif
|
|||||||
|
|
||||||
config BR2_LINUX_KERNEL_VERSION
|
config BR2_LINUX_KERNEL_VERSION
|
||||||
string
|
string
|
||||||
default "5.1.16" if BR2_LINUX_KERNEL_LATEST_VERSION
|
default "5.2" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||||
default "v4.19.13-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
default "v4.19.13-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# 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 54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7 linux-5.2.tar.xz
|
||||||
sha256 8a3e55be3e788700836db6f75875b4d3b824a581d1eacfc2fcd29ed4e727ba3e linux-5.1.16.tar.xz
|
sha256 8a3e55be3e788700836db6f75875b4d3b824a581d1eacfc2fcd29ed4e727ba3e linux-5.1.16.tar.xz
|
||||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||||
sha256 327c5759d5888361d6c9d6adb0c8ad7e3c624eb05bb9e5869d9f3078dd0d3f87 linux-4.19.57.tar.xz
|
sha256 327c5759d5888361d6c9d6adb0c8ad7e3c624eb05bb9e5869d9f3078dd0d3f87 linux-4.19.57.tar.xz
|
||||||
|
@ -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_5_1
|
default BR2_KERNEL_HEADERS_5_2
|
||||||
help
|
help
|
||||||
Select the kernel version to get headers from.
|
Select the kernel version to get headers from.
|
||||||
|
|
||||||
@ -53,6 +53,10 @@ config BR2_KERNEL_HEADERS_5_1
|
|||||||
bool "Linux 5.1.x kernel headers"
|
bool "Linux 5.1.x kernel headers"
|
||||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
||||||
|
|
||||||
|
config BR2_KERNEL_HEADERS_5_2
|
||||||
|
bool "Linux 5.2.x kernel headers"
|
||||||
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
|
||||||
|
|
||||||
config BR2_KERNEL_HEADERS_VERSION
|
config BR2_KERNEL_HEADERS_VERSION
|
||||||
bool "Manually specified Linux version"
|
bool "Manually specified Linux version"
|
||||||
help
|
help
|
||||||
@ -118,6 +122,10 @@ choice
|
|||||||
This is used to hide/show some packages that have strict
|
This is used to hide/show some packages that have strict
|
||||||
requirements on the version of kernel headers.
|
requirements on the version of kernel headers.
|
||||||
|
|
||||||
|
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2
|
||||||
|
bool "5.2.x"
|
||||||
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
|
||||||
|
|
||||||
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1
|
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1
|
||||||
bool "5.1.x"
|
bool "5.1.x"
|
||||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
||||||
@ -302,6 +310,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
|
|||||||
default "4.14.132" if BR2_KERNEL_HEADERS_4_14
|
default "4.14.132" if BR2_KERNEL_HEADERS_4_14
|
||||||
default "4.19.57" if BR2_KERNEL_HEADERS_4_19
|
default "4.19.57" if BR2_KERNEL_HEADERS_4_19
|
||||||
default "5.1.16" if BR2_KERNEL_HEADERS_5_1
|
default "5.1.16" if BR2_KERNEL_HEADERS_5_1
|
||||||
|
default "5.2" if BR2_KERNEL_HEADERS_5_2
|
||||||
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 \
|
||||||
|
@ -429,10 +429,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
|||||||
bool
|
bool
|
||||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
|
||||||
|
|
||||||
|
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
|
||||||
|
bool
|
||||||
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
||||||
|
|
||||||
# This order guarantees that the highest version is set, as kconfig
|
# This order guarantees that the highest version is set, as kconfig
|
||||||
# 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 "5.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
|
||||||
default "5.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
default "5.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
||||||
default "5.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
|
default "5.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
|
||||||
default "4.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
|
default "4.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
|
||||||
|
@ -129,6 +129,10 @@ choice
|
|||||||
m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF
|
m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF
|
||||||
p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF
|
p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF
|
||||||
|
|
||||||
|
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_2
|
||||||
|
bool "5.2.x"
|
||||||
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
|
||||||
|
|
||||||
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1
|
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1
|
||||||
bool "5.1.x"
|
bool "5.1.x"
|
||||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user