toolchain: add 4.1.x choice for headers
PATCH 1/3 toolchain: add 4.1.x choice for headers
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/toolchain-common.in | 5 +++++ toolchain/toolchain-external/Config.in | 4 ++++ 2 files changed, 9 insertions(+)
toolchain/toolchain-common.in +5 -0
@@ -223,10 +223,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 default "4.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
toolchain/toolchain-external/Config.in +4 -0
@@ -981,6 +981,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1 + bool "4.1.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_0 bool "4.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
Signature · 1 line
2.3.6
PATCH 2/3 linux-headers: add 4.1.x series
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/linux-headers/Config.in.host | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
package/linux-headers/Config.in.host +10 -1
@@ -5,7 +5,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" - default BR2_KERNEL_HEADERS_4_0 + default BR2_KERNEL_HEADERS_4_1 help Select the version of kernel header files you wish to use. You must select the correct set of header files to match
@@ -86,6 +86,10 @@ choice bool "Linux 4.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + config BR2_KERNEL_HEADERS_4_1 + bool "Linux 4.1.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" endchoice
@@ -107,6 +111,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1 + bool "4.1.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0 bool "4.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
@@ -212,4 +220,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.18.15" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.5" if BR2_KERNEL_HEADERS_4_0 + default "4.1" if BR2_KERNEL_HEADERS_4_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
Signature · 1 line
2.3.6
PATCH 3/3 linux: bump default to version 4.1
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
linux/Config.in +2 -2
@@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "4.0.5" + bool "4.1" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers"
@@ -109,7 +109,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH config BR2_LINUX_KERNEL_VERSION string - default "4.0.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.1" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION
Signature · 1 line
2.3.6
PATCH 1/3 toolchain: add 4.1.x choice for headers
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 5 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>--- toolchain/toolchain-common.in | 5 +++++ toolchain/toolchain-external/Config.in | 4 ++++ 2 files changed, 9 insertions(+)
All three applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com