jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-25 22:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting 4.17 buildroot changes

Browse Source
This commit is contained in:
Ryan Bray 2018-08-21 03:05:25 -06:00
parent 8e1af1313b
commit 3b45011982
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildroot/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_4_17 default BR2_KERNEL_HEADERS_4_16
help help
Select the kernel version to get headers from. Select the kernel version to get headers from.
@ -71,10 +71,6 @@ config BR2_KERNEL_HEADERS_4_16
bool "Linux 4.16.x kernel headers" bool "Linux 4.16.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
config BR2_KERNEL_HEADERS_4_17
bool "Linux 4.16.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
config BR2_KERNEL_HEADERS_VERSION config BR2_KERNEL_HEADERS_VERSION
bool "Manually specified Linux version" bool "Manually specified Linux version"
@ -97,10 +93,6 @@ 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_4_17
bool "4.17.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16
bool "4.16.x" bool "4.16.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
@ -267,5 +259,4 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "4.14.56" if BR2_KERNEL_HEADERS_4_14 default "4.14.56" if BR2_KERNEL_HEADERS_4_14
default "4.15.18" if BR2_KERNEL_HEADERS_4_15 default "4.15.18" if BR2_KERNEL_HEADERS_4_15
default "4.16.17" if BR2_KERNEL_HEADERS_4_16 default "4.16.17" if BR2_KERNEL_HEADERS_4_16
default "4.17.12" if BR2_KERNEL_HEADERS_4_17
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

5
buildroot/toolchain/Config.in
View File

@ -341,15 +341,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
bool bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
# 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 "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14