From fb29afe2aa6a38df42929fd58fbc2808e27bff76 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 9 Jun 2014 08:30:33 -0300 Subject: [PATCH] toolchain: add 3.15 choice for headers [Thomas: fix BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 to select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 and not itself.] Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-common.in | 5 +++++ toolchain/toolchain-external/Config.in | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 1573e00e9c..a91d247077 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -180,10 +180,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + # 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 "3.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 default "3.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 default "3.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 default "3.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index f4a5ccf653..aa21f22af0 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -1018,6 +1018,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_15 + bool "3.15.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_14 bool "3.14.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 -- 2.30.2