ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-18 20:37:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: Update environment variable usage

Browse Source 
Upstream changes in the way kconfig handles environment variables means
we need to update our usage of them.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham 2020-12-09 21:42:54 +13:00
parent bbc4db1337
commit 8fbf528681
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.in
View File

@ -1,4 +1,4 @@
mainmenu "crosstool-NG $CT_VERSION Configuration" mainmenu "crosstool-NG $(CT_VERSION) Configuration"
source "config/configure.in" source "config/configure.in"
source "config/global.in" source "config/global.in"
source "config/target.in" source "config/target.in"

6
config/global.in
View File

@ -2,7 +2,7 @@
config VERSION config VERSION
string string
option env="CT_VERSION" default "$(CT_VERSION)"
# Config version checking framework. If CONFIG_VERSION is unset in the current .config # Config version checking framework. If CONFIG_VERSION is unset in the current .config
# or defconfig, it is loaded as 0 (possibly triggering a user prompt during 'ct-ng oldconfig'). # or defconfig, it is loaded as 0 (possibly triggering a user prompt during 'ct-ng oldconfig').
@ -16,13 +16,13 @@ config VERSION
# i.e. 'ct-ng saveconfig' or 'ct-ng savedefconfig'. # i.e. 'ct-ng saveconfig' or 'ct-ng savedefconfig'.
config VCHECK config VCHECK
string string
option env="CT_VCHECK" default "$(CT_VCHECK)"
# Kconfig's idiosynchrasy: it does not output the config settings declared with 'option env' # Kconfig's idiosynchrasy: it does not output the config settings declared with 'option env'
# to the generated .config file. Must use one extra level of indirection. # to the generated .config file. Must use one extra level of indirection.
config CONFIG_VERSION_ENV config CONFIG_VERSION_ENV
string string
option env="CT_CONFIG_VERSION_CURRENT" default "$(CT_CONFIG_VERSION_CURRENT)"
# Up-to-date version of the configuration file. If saving a defconfig, choose a default that # Up-to-date version of the configuration file. If saving a defconfig, choose a default that
# is guaranteed not to match - so that kconfig saves the value to .config. # is guaranteed not to match - so that kconfig saves the value to .config.